Fix display of amendment from amendment (#4312)

OpenSlides · Nov 18, 2024 · af83540 · af83540
1 parent 0c4ec2a
commit af83540
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/...ges/motion-form/components/amendment-create-wizard/amendment-create-wizard.component.html b/...ges/motion-form/components/amendment-create-wizard/amendment-create-wizard.component.html
@@ -68,15 +68,19 @@ <h2>{{ 'New amendment' | translate }}</h2>
                                 }
                                 <div class="paragraph-text motion-text">
                                     <div>
-                                        @if (paragraph.lineFrom >= paragraph.lineTo) {
+                                        @let currentParagraphLineFrom =
+                                            isAmendmentOfAmendment ? diffedParagraphs[i].lineFrom : paragraph.lineFrom;
+                                        @let currentParagraphLineTo =
+                                            isAmendmentOfAmendment ? diffedParagraphs[i].lineTo : paragraph.lineTo;
+                                        @if (currentParagraphLineFrom >= currentParagraphLineTo) {
                                             <i class="line-number">
-                                                {{ 'Line' | translate }} {{ paragraph.lineFrom }}:
+                                                {{ 'Line' | translate }} {{ currentParagraphLineFrom }}:
                                             </i>
                                         }
-                                        @if (paragraph.lineFrom < paragraph.lineTo) {
+                                        @if (currentParagraphLineFrom < currentParagraphLineTo) {
                                             <i class="line-number">
-                                                {{ 'Line' | translate }} {{ paragraph.lineFrom }} -
-                                                {{ paragraph.lineTo }}:
+                                                {{ 'Line' | translate }} {{ currentParagraphLineFrom }} -
+                                                {{ currentParagraphLineTo }}:
                                             </i>
                                         }
                                     </div>

diff --git a/...ges/motion-form/components/amendment-create-wizard/amendment-create-wizard.component.scss b/...ges/motion-form/components/amendment-create-wizard/amendment-create-wizard.component.scss
@@ -25,6 +25,10 @@
         }
         .paragraph-text {
             flex: 1;
+
+            .insert {
+                text-decoration: underline !important;
+            }
         }
     }
 

diff --git a/...pages/motion-form/components/amendment-create-wizard/amendment-create-wizard.component.ts b/...pages/motion-form/components/amendment-create-wizard/amendment-create-wizard.component.ts
@@ -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.