Merged PR 1830: #4947 Fix Lastname and Firstname position in order-edit pages

#4947 Fix Lastname and Firstname position in order-edit pages

apps/isa-app/src/shared/components/goods-in-out/goods-in-out-order-edit/goods-in-out-order-edit.component.html

@@ -1,20 +1,38 @@
 <form *ngIf="control" [formGroup]="control" (submit)="submit()">
   <div class="header">
     {{ items[0]?.organisation }}
-    <ng-container *ngIf="!!items[0]?.organisation && (!!items[0]?.firstName || !!items[0]?.lastName)">-</ng-container>
+    <ng-container
+      *ngIf="
+        !!items[0]?.organisation &&
+        (!!items[0]?.firstName || !!items[0]?.lastName)
+      "
+      >-</ng-container
+    >
     {{ items[0]?.lastName }}
     {{ items[0]?.firstName }}
   </div>
 
-  <ui-form-control label="Vorgang-ID" variant="inline" statusLabel="Nicht Änderbar">
+  <ui-form-control
+    label="Vorgang-ID"
+    variant="inline"
+    statusLabel="Nicht Änderbar"
+  >
     <input uiInput formControlName="orderNumber" />
   </ui-form-control>
 
-  <ui-form-control label="Bestelldatum" variant="inline" statusLabel="Nicht Änderbar">
+  <ui-form-control
+    label="Bestelldatum"
+    variant="inline"
+    statusLabel="Nicht Änderbar"
+  >
     <input uiInput formControlName="orderDate" />
   </ui-form-control>
 
-  <ui-form-control label="Bestellkanal" variant="inline" statusLabel="Nicht Änderbar">
+  <ui-form-control
+    label="Bestellkanal"
+    variant="inline"
+    statusLabel="Nicht Änderbar"
+  >
     <input uiInput formControlName="clientChannel" />
   </ui-form-control>
 
@@ -25,40 +43,81 @@
     formGroupName="notificationChannel"
   ></shared-notification-channel-control>
 
-  <ui-form-control label="Kundennummer" variant="inline" statusLabel="Nicht Änderbar">
+  <ui-form-control
+    label="Kundennummer"
+    variant="inline"
+    statusLabel="Nicht Änderbar"
+  >
     <input uiInput formControlName="buyerNumber" />
   </ui-form-control>
 
   <ng-container *ngIf="showNameFields">
-    <ui-form-control label="Name" variant="inline" [statusLabel]="canEditNameFields ? '' : 'Nicht Änderbar'">
-      <input uiInput formControlName="firstName" />
-    </ui-form-control>
-
-    <ui-form-control label="Vorname" variant="inline" [statusLabel]="canEditNameFields ? '' : 'Nicht Änderbar'">
+    <ui-form-control
+      label="Name"
+      variant="inline"
+      [statusLabel]="canEditNameFields ? '' : 'Nicht Änderbar'"
+    >
       <input uiInput formControlName="lastName" />
     </ui-form-control>
 
-    <ui-form-control *ngIf="isB2B" label="Firmenname" variant="inline" [statusLabel]="canEditNameFields ? '' : 'Nicht Änderbar'">
+    <ui-form-control
+      label="Vorname"
+      variant="inline"
+      [statusLabel]="canEditNameFields ? '' : 'Nicht Änderbar'"
+    >
+      <input uiInput formControlName="firstName" />
+    </ui-form-control>
+
+    <ui-form-control
+      *ngIf="isB2B"
+      label="Firmenname"
+      variant="inline"
+      [statusLabel]="canEditNameFields ? '' : 'Nicht Änderbar'"
+    >
       <input uiInput formControlName="organisation" />
     </ui-form-control>
   </ng-container>
 
   <div formArrayName="items">
-    <div *ngFor="let item of itemsControl.controls; index as i" [formGroupName]="i">
+    <div
+      *ngFor="let item of itemsControl.controls; index as i"
+      [formGroupName]="i"
+    >
       <div class="item-header-wrapper">
         <div class="item-header">
-          <img class="cover" *ngIf="item.value?.ean | productImage; let productImage" [src]="productImage" [alt]="item.value?.name" />
+          <img
+            class="cover"
+            *ngIf="item.value?.ean | productImage; let productImage"
+            [src]="productImage"
+            [alt]="item.value?.name"
+          />
           <span class="title">{{ item.value?.name }}</span>
         </div>
 
-        <button class="cta-expand" type="button" (click)="expanded[i] = !expanded[i]">
-          <ui-icon icon="arrow_head" size="16px" [rotate]="expanded[i] ? '90deg' : '270deg'"></ui-icon>
+        <button
+          class="cta-expand"
+          type="button"
+          (click)="expanded[i] = !expanded[i]"
+        >
+          <ui-icon
+            icon="arrow_head"
+            size="16px"
+            [rotate]="expanded[i] ? '90deg' : '270deg'"
+          ></ui-icon>
         </button>
       </div>
 
       <ng-container *ngIf="expanded[i]">
-        <ui-form-control label="Abholfachnummer" [clearable]="true" variant="inline">
-          <input pattern="^\d{3,4}_\d{4}_\d{1,5}$" uiInput formControlName="compartmentCode" />
+        <ui-form-control
+          label="Abholfachnummer"
+          [clearable]="true"
+          variant="inline"
+        >
+          <input
+            pattern="^\d{3,4}_\d{4}_\d{1,5}$"
+            uiInput
+            formControlName="compartmentCode"
+          />
         </ui-form-control>
 
         <shared-goods-in-out-order-details-tags
@@ -66,7 +125,11 @@
           formControlName="compartmentInfo"
         ></shared-goods-in-out-order-details-tags>
 
-        <ui-form-control label="Status" variant="inline" statusLabel="Nicht Änderbar">
+        <ui-form-control
+          label="Status"
+          variant="inline"
+          statusLabel="Nicht Änderbar"
+        >
           <input uiInput formControlName="processingStatus" />
         </ui-form-control>
 
@@ -82,19 +145,37 @@
           </ng-container>
           <ng-container *ngSwitchCase="16777216"></ng-container>
           <ng-container *ngSwitchDefault>
-            <ui-form-control class="datepicker" label="Geändert" variant="inline">
+            <ui-form-control
+              class="datepicker"
+              label="Geändert"
+              variant="inline"
+            >
               <input uiInput formControlName="processingStatusDate" />
             </ui-form-control>
           </ng-container>
         </div>
 
         <ng-template #vslLieferdatum>
-          <ui-form-control class="datepicker" label="vsl. Lieferdatum" variant="inline">
-            <button class="date-btn" type="button" [uiOverlayTrigger]="uiDatepicker" #datepicker="uiOverlayTrigger">
+          <ui-form-control
+            class="datepicker"
+            label="vsl. Lieferdatum"
+            variant="inline"
+          >
+            <button
+              class="date-btn"
+              type="button"
+              [uiOverlayTrigger]="uiDatepicker"
+              #datepicker="uiOverlayTrigger"
+            >
               <strong>
                 {{ items[i]?.estimatedShippingDate | date: 'dd.MM.yy' }}
               </strong>
-              <ui-icon icon="arrow_head" class="dp-button-icon" size="12px" [rotate]="datepicker.opened ? '270deg' : '90deg'"></ui-icon>
+              <ui-icon
+                icon="arrow_head"
+                class="dp-button-icon"
+                size="12px"
+                [rotate]="datepicker.opened ? '270deg' : '90deg'"
+              ></ui-icon>
             </button>
             <ui-datepicker
               formControlName="estimatedShippingDate"
@@ -105,13 +186,20 @@
               [disabledDaysOfWeek]="[0]"
               [selected]="items[i]?.estimatedShippingDate"
               saveLabel="Übernehmen"
-              (save)="changeEstimatedDeliveryDate($event, items[i]); uiDatepicker.close()"
+              (save)="
+                changeEstimatedDeliveryDate($event, items[i]);
+                uiDatepicker.close()
+              "
             ></ui-datepicker>
           </ui-form-control>
         </ng-template>
 
         <ng-template #abholfrist>
-          <ui-form-control class="datepicker" label="Abholfrist" variant="inline">
+          <ui-form-control
+            class="datepicker"
+            label="Abholfrist"
+            variant="inline"
+          >
             <button
               [uiOverlayTrigger]="deadlineDatepicker"
               #deadlineDatepickerTrigger="uiOverlayTrigger"
@@ -122,7 +210,11 @@
               <strong>
                 {{ items[i]?.pickUpDeadline | date: 'dd.MM.yy' }}
               </strong>
-              <ui-icon [rotate]="deadlineDatepickerTrigger.opened ? '270deg' : '90deg'" class="dp-button-icon" icon="arrow_head"></ui-icon>
+              <ui-icon
+                [rotate]="deadlineDatepickerTrigger.opened ? '270deg' : '90deg'"
+                class="dp-button-icon"
+                icon="arrow_head"
+              ></ui-icon>
             </button>
             <ui-datepicker
               formControlName="pickUpDeadline"
@@ -133,33 +225,66 @@
               [disabledDaysOfWeek]="[0]"
               [selected]="items[i]?.pickUpDeadline"
               saveLabel="Übernehmen"
-              (save)="changePickupDeadline($event, items[i]); deadlineDatepicker.close()"
+              (save)="
+                changePickupDeadline($event, items[i]);
+                deadlineDatepicker.close()
+              "
             ></ui-datepicker>
           </ui-form-control>
         </ng-template>
 
-        <ui-form-control label="Menge" variant="inline" statusLabel="Nicht Änderbar">
+        <ui-form-control
+          label="Menge"
+          variant="inline"
+          statusLabel="Nicht Änderbar"
+        >
           <input uiInput formControlName="quantity" />
         </ui-form-control>
 
-        <ui-form-control class="price" label="Preis" [clearable]="true" [suffix]="item.value?.currency" variant="inline" requiredMark=" *">
+        <ui-form-control
+          class="price"
+          label="Preis"
+          [clearable]="true"
+          [suffix]="item.value?.currency"
+          variant="inline"
+          requiredMark=" *"
+        >
           <input uiInput formControlName="price" />
         </ui-form-control>
 
-        <ui-form-control label="ISBN/EAN" [clearable]="true" variant="inline" requiredMark=" *">
+        <ui-form-control
+          label="ISBN/EAN"
+          [clearable]="true"
+          variant="inline"
+          requiredMark=" *"
+        >
           <input uiInput formControlName="ean" />
         </ui-form-control>
 
-        <ui-form-control label="Zielfiliale" variant="inline" statusLabel="Nicht Änderbar">
+        <ui-form-control
+          label="Zielfiliale"
+          variant="inline"
+          statusLabel="Nicht Änderbar"
+        >
           <input uiInput formControlName="targetBranch" />
         </ui-form-control>
 
-        <ui-form-control label="Lieferant" variant="inline" statusLabel="Nicht Änderbar">
+        <ui-form-control
+          label="Lieferant"
+          variant="inline"
+          statusLabel="Nicht Änderbar"
+        >
           <input uiInput formControlName="supplier" />
         </ui-form-control>
 
         <div class="ssc-wrapper">
-          <ui-form-control class="ssc" label="Meldenummer" [clearable]="true" variant="inline" requiredMark=" *">
+          <ui-form-control
+            class="ssc"
+            label="Meldenummer"
+            [clearable]="true"
+            variant="inline"
+            requiredMark=" *"
+          >
             <input class="ssc-input" uiInput formControlName="ssc" />
           </ui-form-control>
           <input class="ssc-text" uiInput formControlName="sscText" />
@@ -174,11 +299,21 @@
 
         <ui-form-control label="MwSt" variant="inline">
           <ui-select formControlName="vat">
-            <ui-select-option *ngFor="let vat of vats$ | async" [label]="vat.name + '%'" [value]="vat.vatType"></ui-select-option>
+            <ui-select-option
+              *ngFor="let vat of vats$ | async"
+              [label]="vat.name + '%'"
+              [value]="vat.vatType"
+            ></ui-select-option>
           </ui-select>
         </ui-form-control>
 
-        <ui-form-control class="special-comment" label="Anmerkung" [clearable]="true" (cleared)="clearSpecialComment(i)" variant="inline">
+        <ui-form-control
+          class="special-comment"
+          label="Anmerkung"
+          [clearable]="true"
+          (cleared)="clearSpecialComment(i)"
+          variant="inline"
+        >
           <textarea
             matInput
             cdkTextareaAutosize
@@ -195,7 +330,15 @@
     </div>
   </div>
   <div class="actions">
-    <button class="cta-close" (click)="navigation.emit({})" type="button">Abbrechen</button>
-    <button class="cta-save" [disabled]="control.invalid || control.disabled" type="submit">Speichern</button>
+    <button class="cta-close" (click)="navigation.emit({})" type="button">
+      Abbrechen
+    </button>
+    <button
+      class="cta-save"
+      [disabled]="control.invalid || control.disabled"
+      type="submit"
+    >
+      Speichern
+    </button>
   </div>
 </form>