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

Fix display of amendment from amendment #4312

Merged
merged 5 commits into from
Nov 18, 2024
Merged

Fix display of amendment from amendment #4312

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
db8003c
Fix underline of new paragraphs
Elblinator Nov 1, 2024
2cf687b
Add line numbers
Elblinator Nov 1, 2024
a306a25
Use @let
Elblinator Nov 7, 2024
789b2d4
Merge branch 'main' into 4191-fix-amendment-display
Elblinator Nov 18, 2024
98f5ae2
Merge branch 'main' into 4191-fix-amendment-display
Elblinator Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 24 additions & 10 deletions ...ges/motion-form/components/amendment-create-wizard/amendment-create-wizard.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,16 +68,30 @@ <h2>{{ 'New amendment' | translate }}</h2>
}
<div class="paragraph-text motion-text">
<div>
@if (paragraph.lineFrom >= paragraph.lineTo) {
<i class="line-number">
{{ 'Line' | translate }} {{ paragraph.lineFrom }}:
</i>
}
@if (paragraph.lineFrom < paragraph.lineTo) {
<i class="line-number">
{{ 'Line' | translate }} {{ paragraph.lineFrom }} -
{{ paragraph.lineTo }}:
</i>
@if (isAmendmentOfAmendment) {
@if (diffedParagraphs[i].lineFrom >= diffedParagraphs[i].lineTo) {
<i class="line-number">
{{ 'Line' | translate }} {{ diffedParagraphs[i].lineFrom }}:
</i>
}
@if (diffedParagraphs[i].lineFrom < diffedParagraphs[i].lineTo) {
<i class="line-number">
{{ 'Line' | translate }} {{ diffedParagraphs[i].lineFrom }} -
{{ diffedParagraphs[i].lineTo }}:
</i>
}
} @else {
@if (paragraph.lineFrom >= paragraph.lineTo) {
<i class="line-number">
{{ 'Line' | translate }} {{ paragraph.lineFrom }}:
</i>
}
@if (paragraph.lineFrom < paragraph.lineTo) {
<i class="line-number">
{{ 'Line' | translate }} {{ paragraph.lineFrom }} -
{{ paragraph.lineTo }}:
</i>
}
}
</div>
<div [innerHTML]="getParagraphPreview(i) | trust: 'html'"></div>
Expand Down
4 changes: 4 additions & 0 deletions ...ges/motion-form/components/amendment-create-wizard/amendment-create-wizard.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@
}
.paragraph-text {
flex: 1;

.insert {
text-decoration: underline !important;
}
Comment on lines +28 to +31
Copy link
Member

Choose a reason for hiding this comment

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

Mmh, I haven't found the usage of this. Is this debug code?

Copy link
Member Author

Choose a reason for hiding this comment

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

This fixes the missing underline if the previous amendment created a completely new paragraph
So no debug code :D

}
}

Expand Down
2 changes: 1 addition & 1 deletion ...pages/motion-form/components/amendment-create-wizard/amendment-create-wizard.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export class AmendmentCreateWizardComponent extends BaseMeetingComponent impleme
/**
* determine if we are in the amendment of amendment mode
*/
private isAmendmentOfAmendment = false;
public isAmendmentOfAmendment = false;

/**
* Change recommendation content.
Expand Down