fixes

dysTOS · Jan 24, 2024 · 6082134 · 6082134
1 parent 4c81823
commit 6082134
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 36 deletions.
diff --git a/.../components/archiv/notenmappen/notenmappe-noten-list/notenmappe-noten-list.component.html b/.../components/archiv/notenmappen/notenmappe-noten-list/notenmappe-noten-list.component.html
@@ -56,7 +56,7 @@
             [value]="selectedNoten"
             [datasource]="notenDatasource"
             [listConfig]="notenAutoCompleteConfig"
-            [label]="configService.appNaming.Noten + ' hinzufügen'"
+            [label]="configService.uiNaming.Noten + ' hinzufügen'"
             (valueChange)="addNotenToMappe($event)"
         ></mkj-autocomplete>
     </div>

diff --git a/src/app/components/termine/termin-details/termin-details.component.html b/src/app/components/termine/termin-details/termin-details.component.html
@@ -71,7 +71,7 @@
                             [datasource]="notenDatasource"
                             [listConfig]="notenAutoCompleteConfig"
                             [label]="
-                                configService.appNaming.Noten + ' hinzufügen'
+                                configService.uiNaming.Noten + ' hinzufügen'
                             "
                             (valueChange)="attachNoten($event)"
                         ></mkj-autocomplete

diff --git a/src/app/components/termine/termine-overview/termine-overview.component.html b/src/app/components/termine/termine-overview/termine-overview.component.html
@@ -50,38 +50,36 @@
         ></mkj-termin-teilnahme-selector>
     </div>
     <mkj-display-model [model]="termin"></mkj-display-model>
-    <div class="flex justify-content-center">
-        <div class="p-buttonset">
-            <button
-                pButton
-                pRipple
-                label="Details"
-                icon="pi pi-list"
-                class="p-button-secondary p-button-rounded p-button-raised"
-                (click)="navigateSingleAusrueckung(termin)"
-            ></button>
-            <button
-                *visibleFor="[Permissions.TERMIN_SAVE]"
-                pButton
-                pRipple
-                icon="pi pi-copy"
-                label="Duplizieren"
-                class="p-button-secondary p-button-rounded p-button-raised"
-                (click)="this.duplicateAusrueckung(termin)"
-            ></button>
-            <button
-                *visibleFor="[
-                    Permissions.TERMIN_SAVE,
-                    Permissions.TERMIN_GRUPPENLEITER_SAVE
-                ]"
-                pButton
-                pRipple
-                icon="pi pi-pencil"
-                label="Bearbeiten"
-                class="p-button-secondary p-button-rounded p-button-raised"
-                (click)="this.navigateEditor(termin)"
-            ></button>
-        </div>
+    <div class="flex justify-content-center gap-2">
+        <button
+            pButton
+            pRipple
+            label="Details"
+            icon="pi pi-list"
+            class="p-button-secondary p-button-rounded p-button-raised"
+            (click)="navigateSingleAusrueckung(termin)"
+        ></button>
+        <button
+            *visibleFor="[Permissions.TERMIN_SAVE]"
+            pButton
+            pRipple
+            icon="pi pi-copy"
+            label="Duplizieren"
+            class="p-button-secondary p-button-outlined p-button-rounded p-button-raised"
+            (click)="this.duplicateAusrueckung(termin)"
+        ></button>
+        <button
+            *visibleFor="[
+                Permissions.TERMIN_SAVE,
+                Permissions.TERMIN_GRUPPENLEITER_SAVE
+            ]"
+            pButton
+            pRipple
+            icon="pi pi-pencil"
+            label="Bearbeiten"
+            class="p-button-secondary p-button-outlined p-button-rounded p-button-raised"
+            (click)="this.navigateEditor(termin)"
+        ></button>
     </div>
 </ng-template>
 

diff --git a/src/app/utilities/mkj-list/mkj-list.component.ts b/src/app/utilities/mkj-list/mkj-list.component.ts
@@ -67,8 +67,9 @@ export class MkjListComponent<T> implements OnChanges {
     public onStateRestore(event: TableState): void {
         // console.log(event);
         if (
-            this.configuration.initialFilter &&
-            MkjListHelper.hasSetFilters(event) === false
+            this.configuration.initialFilter
+            // &&
+            // MkjListHelper.hasSetFilters(event) === false
         ) {
             Object.entries(this.configuration.initialFilter).forEach(
                 ([key, value]) => {