Implement consultation sequence for motions - #6498
Open
Elblinator wants to merge 22 commits into
Open
Conversation
Elblinator
changed the title
sequence of delibatation for motionssequence of deliberation for motions
Elblinator
force-pushed
the
6442-back-to-the-future
branch
from
August 28, 2026 13:05
27ea4cf to
7aa535a
Compare
Elblinator
changed the title
sequence of deliberation for motionsconsultation sequence for motions
bastianjoel
requested changes
Aug 31, 2026
| } | ||
|
|
||
| <!-- Workflow timestamp --> | ||
| <os-motion-manage-timestamp field="workflow_timestamp" title="{{ 'Submission date' | translate }}" [motion]="motion" /> |
Comment on lines
+77
to
+80
| private displayFutureForward = false; | ||
| public displayFutureForward$ = this.meetingSettingsService | ||
| .get(`motions_enable_origin_motion_display`) | ||
| .pipe(map(v => !!v)); |
Member
There was a problem hiding this comment.
Change displayFutureForward to signal and displayFutureForward$ to private. There is already a signals api in place in MeetingSettingsService in feature/vote which this can be replaced with in the future.
| } | ||
|
|
||
| public refreshOriginMotions(): void { | ||
| this.displayFutureForward = true; // TODO: remove this line |
Member
Author
There was a problem hiding this comment.
This is waiting for Dammi or a decision from ABS of what to to without the new setting (I think this will be merged with the new setting)
Comment on lines
+408
to
+428
| public getToolTip(motion: ViewMotion): string { | ||
| let toolTip = ``; | ||
| if (motion.meeting?.location) { | ||
| toolTip = this.translate.instant(`Meeting location`) + `: ` + motion.meeting.location + ` `; | ||
| } | ||
| if (motion.meeting?.start_time) { | ||
| toolTip += | ||
| this.translate.instant(`Meeting start time`) + | ||
| `: ` + | ||
| this.meetingController.parseUnixToMeetingTime(motion.meeting?.start_time * 1000) + | ||
| ` `; | ||
| } | ||
| if (motion.meeting?.end_time) { | ||
| toolTip += | ||
| this.translate.instant(`Meeting end time`) + | ||
| `: ` + | ||
| this.meetingController.parseUnixToMeetingTime(motion.meeting?.end_time * 1000) + | ||
| ` `; | ||
| } | ||
| return toolTip; | ||
| } |
Member
There was a problem hiding this comment.
You can use parameters instead of concatenating your strings since a couple weeks.
https://ngx-translate.org/getting-started/translating-your-components/#with-parameters
https://ngx-translate.org/reference/translate-service-api/#instant
| public searchLists: SearchListDefinition[] = [ | ||
| { | ||
| observable: this.repo.getViewModelListObservable(), | ||
| label: `Motions` |
Member
There was a problem hiding this comment.
Suggested change
| label: `Motions` | |
| label: _(`Motions`) |
Should be marked
| }, | ||
| { | ||
| observable: this.motionForwardingService.forwardingCommitteesObservable, | ||
| label: `Committees`, |
Member
There was a problem hiding this comment.
Suggested change
| label: `Committees`, | |
| label: _(`Committees`), |
| (originToggleDefault$ | async) === false && | ||
| !motion.isAmendment() | ||
| ) { | ||
| |
Member
There was a problem hiding this comment.
Not a good way to add margins
Member
There was a problem hiding this comment.
paginator-intl/paginato-intl.service.ts
Comment on lines
+232
to
+235
| this.motion.derived_motions$.subscribe(_ => this.refreshOriginMotions()), | ||
| this.displayFutureForward$.subscribe((v: boolean) => { | ||
| this.displayFutureForward = v; | ||
| }) |
Member
There was a problem hiding this comment.
Prone to have side effects as displayFutureForward is used within refreshOriginMotions.
Also it looks like that you should use all_derived_motions$ from what I see.
bspekker
requested changes
Aug 31, 2026
bspekker
left a comment
bspekker
left a comment
There was a problem hiding this comment.
- Final meeting: The sequence is currently not available in the final meeting of the consultation sequence (in our example in meeting E or F). The issue does not suggest that this meeting should be excluded.
Closed meetings:
- As far as I understand the issue description the meeting title should not be displayed if I can't access the meeting. (Issue: the path should show this meeting as '[Lock-Icon] Closed Meeting' without a tooltip.)
- Additionally, if the backtracking is active but I can't see the meeting, the on/off button shouldn't be displayed since it leads to undefined content:
Pagination of different paths:
- When backtracking is active and I select the backtracking from a meeting on the second 'page', the content of the pagination jumps to the first page but displays the second page.
- If the selected meeting is only in the path on the second page, the motion from that meeting will appear in a new tab but the button is not selected.
Observe here with meeting Cccccc that is only on second page:
Bildschirmaufzeichnung.vom.2026-08-31.15-55-06.webm
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
3 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.
resolves #6442