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

Projection of amendments with conflicts needs to be improved #2936

Open
2 tasks
Tracked by #2956
MSoeb opened this issue Oct 23, 2023 · 3 comments
Open
2 tasks
Tracked by #2956

Projection of amendments with conflicts needs to be improved #2936

MSoeb opened this issue Oct 23, 2023 · 3 comments
Labels
enhancement General enhancement which is neither bug nor feature needs discussion ui
Milestone

Comments

@MSoeb
Copy link

MSoeb commented Oct 23, 2023

Description: If a motions contains at least two amendments in the same part of the motions text, the motions show a warning sign. If this motion is projected in the diff-version, the projection misses a warning sign about the existent conflicts.

Motion text with conflicts:
Screenshot_20231219_110455

Projection without warning sign:
Screenshot_20231023_101758

Reproduction:

  1. open a meeting
  2. open motions > create a new motion with two paragraphs
  3. create two amendments at the same place. change the status of each one to accepted.
  4. head back to the main motion: warning signs should now be visible. > project the motion in Diff version.

What should happen:

  • The projection should include warning signs of the conflicts of amendments and/or recommendation changes.
  • The projection should follow the visuals of the motion like in image one with information about the amendment. With one small change; Warning sign and information about amendmend should be in one line. So the users could easily spot the changes.

Note: #3110 is a follow up to this issue.

@MSoeb MSoeb added needs discussion enhancement General enhancement which is neither bug nor feature ui labels Oct 23, 2023
@MSoeb MSoeb added this to the 4.x milestone Oct 23, 2023
@emanuelschuetze emanuelschuetze modified the milestones: 4.x, 4.1 Oct 26, 2023
@rrenkert
Copy link
Member

rrenkert commented Nov 1, 2023

Removing "high". Occurs since OS3.

@rrenkert rrenkert removed the high label Nov 1, 2023
@Elblinator Elblinator modified the milestones: 4.1, 4.2 Dec 6, 2023
@MSoeb
Copy link
Author

MSoeb commented Dec 18, 2023

Note: The warning signs in the projection are still missing in the diff projection to easily spot the conflict.

But, another problem has been solved since creation of the issue: The line numbers were wrong in diff projection.

@MSoeb MSoeb changed the title Projection of amendments with conflicts miss information of them Projection of amendments with conflicts needs to be improved Dec 19, 2023
@MSoeb
Copy link
Author

MSoeb commented Aug 16, 2024

Re-Test: Problem still occurs with new editor.

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 needs discussion ui
Projects
None yet
Development

No branches or pull requests

4 participants