Add place sensitive classes

OpenSlides · Oct 17, 2024 · 357d6d7 · 357d6d7
1 parent ddfd731
commit 357d6d7
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 26 deletions.
diff --git a/...mponents/motions/modules/motion-slide/components/motion-slide/motion-slide.component.scss b/...mponents/motions/modules/motion-slide/components/motion-slide/motion-slide.component.scss
@@ -73,25 +73,21 @@
 }
 
 .amendment-nr-n-icon {
-    display: block;
-    //display: flex;
-    //align-items: center;
-    //justify-content: flex-start;
-    //border: 1px solid black;
+    display: flex;
+    align-items: center;
+    justify-content: flex-start;
     position: relative;
     left: -40px;
-    bottom: 12px;
-    height: 0;
-    margin-top: 45px;
+    height: 1.5em;
+    margin-top: 25px;
+}
 
-    .amendment-nr {
-        position: relative;
-        bottom: 3px;
-        font-style: italic;
-        background-color: rgb(224, 224, 224);
-    }
+.amendment-nr {
+    position: relative;
+    font-style: italic;
+    background-color: rgb(224, 224, 224);
 }
 
-.os-linebreak { 
+.os-linebreak {
     display: none !important;
 }
diff --git a/...ges/meetings/pages/motions/services/common/motion-format.service/motion-format.service.ts b/...ges/meetings/pages/motions/services/common/motion-format.service/motion-format.service.ts
@@ -240,20 +240,14 @@ export class MotionFormatService {
                 );
             }
             text.push(...this.addAmendmentNr(changesToShow, changesToShow[i]));
-            if (text[text.length - 3]?.search(`:</span></span>`)) {
-                text[text.length - 1] = text[text.length - 1].replace(`os-line-number `, ``);
-            }
             text.push(this.diffService.getChangeDiff(motionText, changesToShow[i], lineLength, highlightedLine));
             lastLineTo = changesToShow[i].getLineTo();
         }
 
         text.push(
             this.diffService.getTextRemainderAfterLastChange(motionText, changesToShow, lineLength, highlightedLine)
         );
-        if (text[0].match(`<os-linebreak data-line-number="1" class="os-line-number line-number-1"></os-linebreak>`)) {
-            text[0] = text[0].replace(`os-line-number `, ``);
-        }
-        return text.join(``);
+        return this.adjustDiffClasses(text).join(``);
     };
 
     public hasCollissions(change: ViewUnifiedChange, changes: ViewUnifiedChange[]): boolean {
@@ -263,14 +257,28 @@ export class MotionFormatService {
     private addAmendmentNr(changesToShow: ViewUnifiedChange[], current_text: ViewUnifiedChange): string[] {
         const lineNumbering = this.settings.instant(`motions_default_line_numbering`);
         const amendmentNr: string[] = [];
-        amendmentNr.push(`<span class="amendment-nr-n-icon">`);
+
         if (this.hasCollissions(current_text, changesToShow)) {
             if (lineNumbering === LineNumberingMode.Outside) {
-                amendmentNr.push(`<mat-icon class="margin-right-10">warning</mat-icon>`);
+                amendmentNr.push(
+                    `<span class="amendment-nr-n-icon"><mat-icon class="margin-right-10">warning</mat-icon>`
+                );
             } else if (lineNumbering === LineNumberingMode.Inside) {
-                amendmentNr.push(`<mat-icon class="margin-left-45">warning</mat-icon>`);
+                amendmentNr.push(
+                    `<span class="amendment-nr-n-icon"><mat-icon class="margin-left-45">warning</mat-icon>`
+                );
             } else {
-                amendmentNr.push(`<mat-icon class="margin-left-40">warning</mat-icon>`);
+                amendmentNr.push(
+                    `<span class="amendment-nr-n-icon"><mat-icon class="margin-left-40">warning</mat-icon>`
+                );
+            }
+        } else {
+            if (lineNumbering === LineNumberingMode.Outside) {
+                amendmentNr.push(`<span class="amendment-nr-n-icon">`);
+            } else if (lineNumbering === LineNumberingMode.Inside) {
+                amendmentNr.push(`<span class="margin-left-46 amendment-nr-n-icon">`);
+            } else {
+                amendmentNr.push(`<span class="margin-left-40 amendment-nr-n-icon">`);
             }
         }
         if (`amend_nr` in current_text) {
@@ -284,4 +292,22 @@ export class MotionFormatService {
         }
         return amendmentNr;
     }
+
+    private adjustDiffClasses(text: string[]): string[] {
+        for (let i = 0; i < text.length; i++) {
+            // Removes the unwanted gap between the paragraph and the amendment number
+            if (text[i]?.search(`amendment-nr-n-icon`) > -1) {
+                text[i + 4] = text[i + 4]?.replace(`os-split-after`, `os-split-after margin-top-0`);
+                if (i < 4) {
+                    text[i + 3] = text[i + 3]?.replace(`os-split-after`, `os-split-after margin-top-0`);
+                }
+            }
+
+            // Removes the doubled numbers
+            if (text[i]?.search(`<os-linebreak`) > -1) {
+                text[i] = text[i].replace(`os-line-number `, ``);
+            }
+        }
+        return text;
+    }
 }