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.

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

Speaking time edit and overtime #3160

Conversation

reiterl
Copy link
Member

@reiterl reiterl commented Jan 18, 2024

First draft version of the edit and overhang times parts of the speaking times component.

@bastianjoel Pls have a look at it.

@reiterl reiterl added this to the 4.2 milestone Jan 18, 2024
@reiterl reiterl marked this pull request as ready for review January 18, 2024 14:25
@reiterl reiterl assigned Elblinator and unassigned reiterl Jan 18, 2024
@bastianjoel bastianjoel changed the title Los ext speaking time edit and overtime Speaking time edit and overtime Jan 18, 2024
@bastianjoel
Copy link
Member

bastianjoel commented Jan 18, 2024

Apart from the remaining todos this LGTM. You could also cleanup the comments with the descriptions of the functionality.

@bastianjoel bastianjoel removed their assignment Jan 18, 2024
Copy link
Member

@Elblinator Elblinator left a comment

Choose a reason for hiding this comment

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

Overhang time can be activated if a contribution is only paused, should only be possible if the contribution is stopped

After overhang time was distributed once the following Error is thrown in the console

speaking-times.component.ts:62 ERROR TypeError: Cannot read properties of null (reading 'getTitle')

the displayed speaking times in the LoS and in the Speaking times Card are different.
the displayed time in speaking times is correct, please adjust the speaking times in the LoS

@Elblinator Elblinator assigned reiterl and unassigned Elblinator Jan 19, 2024
@reiterl
Copy link
Member Author

reiterl commented Jan 19, 2024

The addition of the overhang time is only enabled, if all speakers of a speakingTime are not "active" and not "paused".

I couldn't reproduce the type error. @Elblinator said, with clean data, the error no longer occurs.

The third cr is still open.

The additional time is already in the remaining time added.
@reiterl
Copy link
Member Author

reiterl commented Jan 22, 2024

Update the los content display. Now speaking times and los display the same times, even if additional time is there.

@reiterl reiterl assigned bastianjoel and Elblinator and unassigned reiterl Jan 22, 2024
Copy link
Member

@Elblinator Elblinator left a comment

Choose a reason for hiding this comment

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

The overhang time should only be added onto the structure levels which are represented in the LoS

If you have structure levels A, B and C and only participants from A and B are on the LoS (so far) overhang time should only be added onto Level A and B

@jsangmeister
Copy link
Contributor

The overhang time should only be added onto the structure levels which are represented in the LoS

If you have structure levels A, B and C and only participants from A and B are on the LoS (so far) overhang time should only be added onto Level A and B

Must be fixed in the backend -> OpenSlides/openslides-backend#2140

@Elblinator Elblinator assigned bastianjoel and unassigned reiterl Jan 22, 2024
@Elblinator Elblinator self-requested a review January 22, 2024 11:39
Copy link
Member

@Elblinator Elblinator left a comment

Choose a reason for hiding this comment

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

if the fix needs to be in the backend, then I approve this PR
It can also be mergeed after to code review is through imo

@bastianjoel bastianjoel assigned reiterl and unassigned bastianjoel Jan 22, 2024
@bastianjoel bastianjoel marked this pull request as draft January 22, 2024 12:20
@bastianjoel bastianjoel marked this pull request as ready for review January 22, 2024 13:14
@bastianjoel bastianjoel merged commit 773f58c into OpenSlides:feature/los-extension Jan 22, 2024
2 checks passed
@reiterl reiterl deleted the los-ext-speaking-time-edit-and-overtime branch January 22, 2024 13:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants