Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 40 additions & 2 deletions src/services/Wagon.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,9 @@ export class Wagon {

const json = await response.json()

const lineDto = json.data.lines.find((x: any) => x.number.toUpperCase() === lineNumber.toUpperCase())
const lineDto = json.data.lines.find(
(x: any) => x.number.toUpperCase() === lineNumber.toUpperCase()
)

const line = this.lineFromDTO(lineDto)

Expand Down Expand Up @@ -142,6 +144,33 @@ export class Wagon {

return "info"
}
/**
*
* @param disruptions - Liste des perturbations
* @param currentLineName - Nom de la ligne actuelle
* @returns boolean True si il y a une perturbation de type incident ou stoppedService sur la ligne actuelle
*/
private static shouldOnlyShowDisruptionForCurrentLine(
disruptions: SimpleDisruption[],
currentLineName: string
): boolean {
const targetTypes = ["incident", "stoppedService"]
// Nombre de perturbations nécessaires pour afficher UNIQUEMENT les perturbations sur la ligne actuelle
const numberOfDisruptionsNeeded = 3
// Retourne True si il y a une perturbation de type incident ou stoppedService sur la ligne actuelle
// Ou s'il y a plus de 3 perturbations sur la ligne actuelle
return (
disruptions.some((disruption) => {
return (
disruption.line.number === currentLineName &&
targetTypes.includes(disruption.type)
)
}) ||
disruptions.filter((disruption) => {
return disruption.line.number === currentLineName
}).length >= numberOfDisruptionsNeeded
)
}
Comment on lines +147 to +173
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mettre ça dans un fichier utilitaire

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Est ce qu'il n'y a que ces deux cas ? Sinon on pourrait aussi return un enum qui dit comment on doit afficher toutes les perturbations retournées par l'api : toutes / ligne courante uniquement


public static async getDisruptions(
lat: number,
Expand Down Expand Up @@ -187,7 +216,16 @@ export class Wagon {
type: this.getDisruptionType(disruption.cause, disruption.effect),
})
}

const urlSearchParams = new URLSearchParams(window.location.search)
const currentLineName = urlSearchParams.get("for")
if (
currentLineName &&
this.shouldOnlyShowDisruptionForCurrentLine(disruptions, currentLineName)
) {
return disruptions.filter(
(disruption) => disruption.line.number === currentLineName
)
}
Comment on lines +219 to +228
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Le service devrait rester intact. Puis ça oblige à récupérer l'URL courante.
Il faudrait bouger le code de tri dans la vue qui affiche les perturbations. (Au niveau de screen.vue sûrement)

return disruptions
}
}