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

Jump to bottom

Made amendment free text show on projection #2258

Merged
merged 4 commits into from
May 16, 2023
Merged

Made amendment free text show on projection #2258

merged 4 commits into from
May 16, 2023

Conversation

luisa-beerboom
Copy link
Member

Closes #2218

@luisa-beerboom luisa-beerboom added this to the 4.1 milestone May 5, 2023
emanuelschuetze
emanuelschuetze requested changes May 5, 2023
View reviewed changes
Copy link
Member

@emanuelschuetze emanuelschuetze left a comment

Choose a reason for hiding this comment

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

If you disable the motion settings "Show motion text on projector" the projected free text amendment still shows "No changes on the text":

amendment-free-projection

@luisa-beerboom
Copy link
Member Author

If you disable the motion settings "Show motion text on projector" the projected free text amendment still shows "No changes on the text":

amendment-free-projection

That's an autoupdate problem

@luisa-beerboom luisa-beerboom mentioned this pull request May 8, 2023
Closed
@luisa-beerboom
Copy link
Member Author

@emanuelschuetze I made a PR in the autoupdate that should fix this, please test OpenSlides/openslides-autoupdate-service#678 together with this branch.

bastianjoel
bastianjoel requested changes May 8, 2023
View reviewed changes
...es/motions/pages/motion-detail/components/motion-detail-diff/motion-detail-diff.component.ts Outdated
@@ -209,6 +209,7 @@ export class MotionDetailDiffComponent extends BaseMeetingComponent implements A
firstLine: this.motion.firstLine
});
}
console.log(`BASETEXT`, baseText, this.getAllTextChangingObjects());
Copy link
Member

Choose a reason for hiding this comment

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

Debug output should be removed

emanuelschuetze
emanuelschuetze previously requested changes May 8, 2023
View reviewed changes
Copy link
Member

@emanuelschuetze emanuelschuetze left a comment

Choose a reason for hiding this comment

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

The projector shows still amendment text if settings "Show motion text on projector" is disabled.

@luisa-beerboom
Copy link
Member Author

luisa-beerboom commented May 9, 2023 •
edited
Loading

The projector shows still amendment text if settings "Show motion text on projector" is disabled.

So what do you want the projector to show for text amendments if the setting is disabled? Because I understood your previous remark to mean that you wanted the text to be shown in this circumstance...

@luisa-beerboom
Copy link
Member Author

Update: It should not show any text at all.
No "The assembly may decide" and no "No changes at the text", just title and submitters

@luisa-beerboom luisa-beerboom self-assigned this May 9, 2023
@luisa-beerboom
Copy link
Member Author

luisa-beerboom commented May 10, 2023 •
edited
Loading

Update after talking to @emanuelschuetze
Disabling motion texts on projector should disable any and all text including diff lines for paragraph based amendments. The entire block down from and including "The assembly may decide" should be gone regardless of motion type, as soon as the setting is disabled!

TODO:

  • Change the component to never show that block when the setting is disabled.
  • Make an autoupdate issue/PR that removes the amendment paragraph information as well if the setting is disabled (since it is unnecessary at that point)

@luisa-beerboom luisa-beerboom mentioned this pull request May 15, 2023
Merged
@luisa-beerboom
Copy link
Member Author 

* [x]  Make an autoupdate issue/PR that removes the amendment paragraph information as well if the setting is disabled (since it is unnecessary at that point)

=> OpenSlides/openslides-autoupdate-service#687

@bastianjoel bastianjoel removed their assignment May 15, 2023
@luisa-beerboom luisa-beerboom enabled auto-merge (squash) May 16, 2023 10:57
@luisa-beerboom luisa-beerboom disabled auto-merge May 16, 2023 10:57
@m-schieder m-schieder removed the request for review from emanuelschuetze May 16, 2023 10:59
@luisa-beerboom luisa-beerboom merged commit d6c5e3d into OpenSlides:main May 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bastianjoel bastianjoel bastianjoel approved these changes

@emanuelschuetze emanuelschuetze emanuelschuetze left review comments

Assignees

@emanuelschuetze emanuelschuetze

Labels
bug high
Projects
None yet
Milestone
4.1
Development

Successfully merging this pull request may close these issues.

Project free text amendment does not work
3 participants
@luisa-beerboom @emanuelschuetze @bastianjoel