feat: Affichage uniquement des disruption de la ligne dans certains cas#6
Open
Leon-ED wants to merge 1 commit intoarnoclr:mainfrom
Open
feat: Affichage uniquement des disruption de la ligne dans certains cas#6Leon-ED wants to merge 1 commit intoarnoclr:mainfrom
Leon-ED wants to merge 1 commit intoarnoclr:mainfrom
Conversation
arnoclr
requested changes
Jun 25, 2024
Comment on lines
+219
to
+228
| 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 | ||
| ) | ||
| } |
Owner
There was a problem hiding this comment.
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)
Comment on lines
+147
to
+173
| /** | ||
| * | ||
| * @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 | ||
| ) | ||
| } |
Owner
There was a problem hiding this comment.
Mettre ça dans un fichier utilitaire
Owner
There was a problem hiding this comment.
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
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
IRL les Infos trafic de la ligne actuelle sont prioritaires dans certains cas.
Ici s'il y en a plus de 2 ou s'il on en a de type 'incident' ou 'stoppedService' alors on affiche que celles-la.
Exemples :
Incident mais on voit les infos de toutes les lignes sauf de la A
Après :