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

Motion with amendments add icon and amendment number #4199

Merged
merged 13 commits into from
Oct 28, 2024

Conversation

Elblinator
Copy link
Member

@Elblinator Elblinator commented Oct 1, 2024

closes part of #4159

  • the same warn icon should be projected as it is in the motion-detail
  • The amendment nr should be projected in the same line as the icon (if there is no nr then only the icon is projected
  • The amendment status should not be projected
  • The icon and Nr should be indented in the same way as they are displayed in the motion-detail
  • If an amendment has no icon and no Nr then the word "Amendment" should be projected
  • If reasonably possible in this issue the submitter from the amendment should be behind the Nr

The first part is not part of an enhancement but a bug in the motion projection

@Elblinator Elblinator added the enhancement General enhancement which is neither bug nor feature label Oct 1, 2024
@Elblinator Elblinator added this to the 4.2 milestone Oct 1, 2024
@Elblinator
Copy link
Member Author

Notes:
bottom:12px is okay if the first line of a paragraph is changed

bottom needs to be bigger if a line inside of a paragraph is changed

@Elblinator Elblinator force-pushed the 4159-motion-w-amend-projection branch from 63f2335 to 63a10f8 Compare October 10, 2024 15:07
@Elblinator Elblinator force-pushed the 4159-motion-w-amend-projection branch from b72bb03 to 357d6d7 Compare October 17, 2024 13:35
@Elblinator Elblinator assigned bastianjoel and MSoeb and unassigned Elblinator Oct 17, 2024
@Elblinator Elblinator marked this pull request as ready for review October 17, 2024 13:41
@bastianjoel bastianjoel removed their assignment Oct 18, 2024
@Elblinator Elblinator requested a review from bspekker October 24, 2024 09:14
Copy link

@bspekker bspekker left a comment

Choose a reason for hiding this comment

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

Two superfluous line numbers in projector:

  1. Additional line number with empty line appears for first amendment if first amendment only changes up to line x in the motion and second amendment makes changes from line x+1 onwards.
    image

  2. Line number overlaps with conflict symbol if one amendment spans several paragraphs but the other one does not with the conflict only appearing in the second paragraph.
    image

@Elblinator
Copy link
Member Author

I removed the doubled line numbers

@Elblinator Elblinator requested review from bspekker and removed request for MSoeb October 25, 2024 13:02
@Elblinator Elblinator force-pushed the 4159-motion-w-amend-projection branch from 436919e to af5910b Compare October 25, 2024 13:04
Copy link

@bspekker bspekker left a comment

Choose a reason for hiding this comment

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

Amendment numbers on projector use different font for italics than in the motion. This causes the colon to not be highlighted in gray completely.

Indication of change recommendations are missing. Sould say "Change recommendation" like it does for amendments without number and symbol.

@bspekker bspekker assigned Elblinator and unassigned bspekker Oct 28, 2024
@bspekker bspekker merged commit 53ee3e1 into OpenSlides:main Oct 28, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement General enhancement which is neither bug nor feature high Schrödinger projectname
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants