Merge branch 'main' into add-new-stack

Hochfrequenz · Dec 17, 2024 · 480105f · 480105f
2 parents 0efc0d1 + dfc1c0c
commit 480105f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 12 deletions.
diff --git a/src/app/features/ahbs/components/ahb-table/ahb-table.component.html b/src/app/features/ahbs/components/ahb-table/ahb-table.component.html
@@ -68,11 +68,14 @@
         </td>
         <td class="px-6 py-4 conditions-column">
           @if (line.conditions) {
-            <p
-              [innerHTML]="
-                getDisplayText(line.conditions, i) | highlight: highlight()
-              "
-            ></p>
+            @for (
+              condition of addConditionLineBreaks(
+                getDisplayText(line.conditions, i)
+              );
+              track $index
+            ) {
+              <div [innerHTML]="condition | highlight: highlight()"></div>
+            }
             @if (shouldShowToggle(line.conditions)) {
               <button
                 (click)="toggleExpand(i)"

diff --git a/src/app/features/ahbs/components/ahb-table/ahb-table.component.ts b/src/app/features/ahbs/components/ahb-table/ahb-table.component.ts
@@ -191,8 +191,13 @@ export class AhbTableComponent {
     return mapping[key] || '';
   }
 
+  // split before [<condition>] and remove empty strings
   addConditionLineBreaks(conditions: string): string[] {
-    return conditions ? conditions.split('\n') : [];
+    if (!conditions) return [];
+    return conditions
+      .split(/(?=\[\d+\])/)
+      .map((s) => s.trim())
+      .filter((s) => s);
   }
 
   toggleExpand(index: number) {
@@ -210,17 +215,18 @@ export class AhbTableComponent {
   // "mehr/weniger anzeigen" toggle for 'Bedingungen/Hinweise' column if len > COLLAPSE_LENGTH
   shouldShowToggle(conditions: string): boolean {
     if (!conditions) return false;
-    return conditions.length > this.COLLAPSE_LENGTH;
+    const allConditions = this.addConditionLineBreaks(conditions);
+    return allConditions.length > 1;
   }
 
   getDisplayText(conditions: string, rowIndex: number): string {
     if (!conditions) return '';
-    if (
-      this.isExpanded(rowIndex) ||
-      conditions.length <= this.COLLAPSE_LENGTH
-    ) {
+    const allConditions = this.addConditionLineBreaks(conditions);
+
+    if (this.isExpanded(rowIndex)) {
       return conditions;
     }
-    return conditions.substring(0, this.COLLAPSE_LENGTH) + ' ...';
+
+    return allConditions[0];
   }
 }