-
Notifications
You must be signed in to change notification settings - Fork 3
feat: Affichage uniquement des disruption de la ligne dans certains cas #6
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Leon-ED
wants to merge
1
commit into
arnoclr:main
Choose a base branch
from
Leon-ED:feat/disruptionsPrioritization
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+40
−2
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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) | ||
|
|
||
|
|
@@ -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 | ||
| ) | ||
| } | ||
|
|
||
| public static async getDisruptions( | ||
| lat: number, | ||
|
|
@@ -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
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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. |
||
| return disruptions | ||
| } | ||
| } | ||
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.
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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