Skip to content
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.

Sign up for GitHub

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

Change display of identical motions #3425

Merged
merged 11 commits into from
Mar 15, 2024
Merged

Change display of identical motions #3425

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f696207
Change display of identical text
reiterl Mar 12, 2024
2882c35
Add commas to identical motions list
reiterl Mar 13, 2024
4fc8b3c
Update comma display and add space between motions
reiterl Mar 13, 2024
2f38021
Use the comma-separating-listing component
reiterl Mar 13, 2024
3f38a0f
Update display of identical motions
reiterl Mar 14, 2024
fd18b2c
Fix layout
reiterl Mar 14, 2024
3aefede
Use different space in listing and update identical motions
reiterl Mar 14, 2024
7e761bd
Use comma-separated listing with additional span
jsangmeister Mar 14, 2024
3fc7a04
Use middot and move identical motions display
reiterl Mar 15, 2024
64d8930
Merge branch 'main' into 3418-change-display-of-identical-text
reiterl Mar 15, 2024
9e114a5
Rename motion identical label
reiterl Mar 15, 2024
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
3 changes: 2 additions & 1 deletion ...s/motions/pages/motion-detail/components/motion-meta-data/motion-meta-data.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,8 @@ <h4>{{ (motion.hasLeadMotion ? 'Identical amendments' : 'Identical motions') | t
[routerLink]="['/', activeMeetingId, 'motions', identicalMotion.sequential_number]"
[state]="{ back: 'true' }"
>
{{ identicalMotion.numberOrTitle }}
{{ identicalMotion.numberOrTitle
}}{{ showIdenticalMotionComma(identicalMotion, motion?.identical_motions) ? ',' : '' }}
jsangmeister marked this conversation as resolved.
Show resolved Hide resolved
</a>
</span>
</div>
Expand Down
4 changes: 4 additions & 0 deletions ...ges/motions/pages/motion-detail/components/motion-meta-data/motion-meta-data.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,10 @@ export class MotionMetaDataComponent extends BaseMotionDetailChildComponent impl
return origin?.canAccess();
}

public showIdenticalMotionComma(identical: ViewMotion, identical_motions: ViewMotion[]): boolean {
return identical_motions.length > 0 && identical.id !== identical_motions[identical_motions.length - 1].id;
}

protected override onAfterSetMotion(previous: ViewMotion, current: ViewMotion): void {
super.onAfterSetMotion(previous, current);
this.updateSupportersSubject();
Expand Down
Loading