[Styling Feedback JSchell] + shipDocId Parser 6-digits in template

2025-12-28 22:42:11 +01:00 · 2020-03-06 12:43:11 +01:00
parent dd81b8d019
commit 58a2e4e7f7
10 changed files with 100 additions and 39 deletions
--- a/apps/sales/src/app/modules/remission/components/remission-list-card-started/remission-list-card-started.component.html
+++ b/apps/sales/src/app/modules/remission/components/remission-list-card-started/remission-list-card-started.component.html
@@ -35,7 +35,7 @@
                height="17px"
              ></lib-icon>
            </span>
-            <span class="format-description">{{ product.format }}</span>
+            <span class="format-description">{{ product.formatDetail }}</span>
            <span *ngIf="product.edition">|</span>
            <span class="edition">{{ product.edition }}</span>
          </div>
--- a/apps/sales/src/app/modules/remission/components/remission-list-card-started/remission-list-card-started.component.scss
+++ b/apps/sales/src/app/modules/remission/components/remission-list-card-started/remission-list-card-started.component.scss
@@ -84,6 +84,17 @@
          font-weight: bold;
          color: #000000;

+          .format-description {
+            max-width: 60%;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+
+            &.expand {
+              max-width: 80%;
+            }
+          }
+
          .format-edition {
            display: flex;
            flex-direction: row;
--- a/apps/sales/src/app/modules/remission/components/remission-list-card/remission-list-card.component.html
+++ b/apps/sales/src/app/modules/remission/components/remission-list-card/remission-list-card.component.html
@@ -16,15 +16,27 @@
    </div>
    <div class="card-details">
      <div class="icon">
-        <img [src]="product.imageId | bookImageUrl | async" alt="book" class="thumbnail" />
+        <img
+          [src]="product.imageId | bookImageUrl | async"
+          alt="book"
+          class="thumbnail"
+        />
      </div>
      <div class="details-info">
        <div class="general">
          <div class="format-edition item">
            <span class="format-icon">
-              <lib-icon name="Icon_{{ product.format }}" mt="4px" height="17px"></lib-icon>
+              <lib-icon
+                name="Icon_{{ product.format }}"
+                mt="4px"
+                height="17px"
+              ></lib-icon>
            </span>
-            <span class="format-description">{{ product.format }}</span>
+            <span
+              class="format-description"
+              [ngClass]="{ expand: !product?.edition?.length }"
+              >{{ product.formatDetail }}</span
+            >
            <span *ngIf="product.edition">|</span>
            <span class="edition">{{ product.edition }}</span>
          </div>
@@ -36,16 +48,30 @@
            <span class="currency">{{ product.currency }}</span>
          </div>
          <div class="features item" *ngIf="isArray(product.features)">
-            <ng-container *ngFor="let feature of product.features; let index = index">
+            <ng-container
+              *ngFor="let feature of product.features; let index = index"
+            >
              <div class="features__tooltip-container">
                <div class="features__tooltip" *ngIf="toolTipOpened[index]">
-                  <div class="feature-tooltip" [style.marginLeft.px]="tooltipMl">
+                  <div
+                    class="feature-tooltip"
+                    [style.marginLeft.px]="tooltipMl"
+                  >
                    {{ getObjectValue(feature, 0) }}
-                    <lib-icon (click)="closeTooltip(index)" height="11px" name="Delete-white"></lib-icon>
+                    <lib-icon
+                      (click)="closeTooltip(index)"
+                      height="11px"
+                      name="Delete-white"
+                    ></lib-icon>
                  </div>
-                  <div class="feature-tooltip-arrow-down" [style.marginLeft.px]="tooltipArrowMl"></div>
+                  <div
+                    class="feature-tooltip-arrow-down"
+                    [style.marginLeft.px]="tooltipArrowMl"
+                  ></div>
                </div>
-                <span (click)="openTooltip(index)">{{ getObjectKey(feature, 0) }}</span>
+                <span (click)="openTooltip(index)">{{
+                  getObjectKey(feature, 0)
+                }}</span>
              </div>
            </ng-container>
          </div>
@@ -62,8 +88,12 @@
            <div class="data">{{ product.inStock }}x</div>
            <div class="data">{{ product.remissionQuantity }}x</div>
            <div class="data short">{{ product.remainingQuantity }}x</div>
-            <div class="data short">{{ product.placementType ? product.placementType : '&nbsp;' }}</div>
-            <div class="data" *ngIf="product.remissionReason">{{ product.remissionReason }}</div>
+            <div class="data short">
+              {{ product.placementType ? product.placementType : '&nbsp;' }}
+            </div>
+            <div class="data" *ngIf="product.remissionReason">
+              {{ product.remissionReason }}
+            </div>
          </div>
        </div>
      </div>
--- a/apps/sales/src/app/modules/remission/components/remission-list-card/remission-list-card.component.scss
+++ b/apps/sales/src/app/modules/remission/components/remission-list-card/remission-list-card.component.scss
@@ -81,6 +81,17 @@
          font-weight: bold;
          color: #000000;

+          .format-description {
+            max-width: 60%;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+
+            &.expand {
+              max-width: 80%;
+            }
+          }
+
          .format-edition {
            display: flex;
            flex-direction: row;
--- a/apps/sales/src/app/modules/remission/components/remissions-overview-card-content/remissions-overview-card-content.component.html
+++ b/apps/sales/src/app/modules/remission/components/remissions-overview-card-content/remissions-overview-card-content.component.html
@@ -14,7 +14,7 @@
  <div class="content-row">
    <div class="content-field">
      <span class="descriptor">Anzahl Positionen</span>
-      <span class="value"> {{ numberOfItems }} </span>
+      <span class="value"> {{ numberOfItems }}x </span>
    </div>

    <div class="content-field">
--- a/apps/sales/src/app/modules/remission/components/remissions-overview-card/remissions-overview-card.component.html
+++ b/apps/sales/src/app/modules/remission/components/remissions-overview-card/remissions-overview-card.component.html
@@ -6,7 +6,13 @@
  <div class="card-wrapper">
    <div class="card-header">
      <span *ngIf="!shippingDocumentIsCompleted" class="red-circle"></span>
-      <div class="card-title">#{{ shippingDocumentId }}</div>
+      <div class="card-title">
+        #{{
+          shippingDocumentNumber
+            | shippingDocumentNumberFormatter
+            | packageNumberParser
+        }}
+      </div>
    </div>

    <app-remissions-overview-card-content
--- a/apps/sales/src/app/modules/remission/pages/remission-details/remission-details.component.html
+++ b/apps/sales/src/app/modules/remission/pages/remission-details/remission-details.component.html
@@ -28,7 +28,11 @@
        <div class="header">
          <div class="title">Warenbegleitschein</div>
          <div class="title">
-            #{{ remissionProcess.shippingDocuments[0].id }}
+            #{{
+              remissionProcess.shippingDocuments[0].shippingDocumentNumber
+                | shippingDocumentNumberFormatter
+                | packageNumberParser
+            }}
          </div>
        </div>

@@ -73,9 +77,9 @@
        Bitte prüfen Sie, ob die Artikel in der Wanne mit den Titeln auf dem
        Warenbegleitschein identisch sind.
      </div>
-      <app-button primary="true" (action)="openRemission(remissionProcess)"
-        >Warenbegleitschein öffnen</app-button
-      >
+      <app-button primary="true" (action)="openRemission(remissionProcess)">
+        Warenbegleitschein öffnen
+      </app-button>
    </div>
  </div>

--- a/apps/sales/src/app/pipes/trim.pipe.ts
+++ b/apps/sales/src/app/pipes/trim.pipe.ts
@@ -1,14 +1,13 @@
 import { Pipe, PipeTransform } from '@angular/core';

@Pipe({
-  name: 'trim',
+  name: 'trim'
 })
 export class TrimPipe implements PipeTransform {
  transform(value: string): string {
    if (!value) {
      return '';
    }
-    console.log(value, value.trim());
    return value.trim();
  }
 }
--- a/package-lock.json
+++ b/package-lock.json
@@ -1039,33 +1039,33 @@
      }
    },
    "@cmf/catalog-api": {
-      "version": "0.1.25",
-      "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@cmf/catalog-api/-/catalog-api-0.1.25.tgz",
-      "integrity": "sha1-ei0AyWpHjSrGUsxaiVqKWGeXK7s=",
+      "version": "0.1.26",
+      "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@cmf/catalog-api/-/catalog-api-0.1.26.tgz",
+      "integrity": "sha1-3I529t6MTaLpvWd3GUTfKKcFx84=",
      "requires": {
        "tslib": "^1.9.0"
      }
    },
    "@cmf/core": {
-      "version": "0.1.25",
-      "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@cmf/core/-/core-0.1.25.tgz",
-      "integrity": "sha1-h2Z1h5MBHRNA3LnDk7R6gaFhvEI=",
+      "version": "0.1.26",
+      "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@cmf/core/-/core-0.1.26.tgz",
+      "integrity": "sha1-qHkh41QAIUC/NbnDjRMR+uicXyY=",
      "requires": {
        "tslib": "^1.9.0"
      }
    },
    "@cmf/inventory-api": {
-      "version": "0.1.25",
-      "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@cmf/inventory-api/-/inventory-api-0.1.25.tgz",
-      "integrity": "sha1-XNQWWPxmmHDff77KWKzVXxwSWYo=",
+      "version": "0.1.26",
+      "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@cmf/inventory-api/-/inventory-api-0.1.26.tgz",
+      "integrity": "sha1-UP6Fo/ZADXGQPEsFQ9n0tmSXvSE=",
      "requires": {
        "tslib": "^1.9.0"
      }
    },
    "@cmf/trade-api": {
-      "version": "0.1.25",
-      "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@cmf/trade-api/-/trade-api-0.1.25.tgz",
-      "integrity": "sha1-FebJbZC4psk7gu2/6h+u3rxL680=",
+      "version": "0.1.26",
+      "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@cmf/trade-api/-/trade-api-0.1.26.tgz",
+      "integrity": "sha1-JF1sHPIZRwbJMr8lPbqIH2ZdfJc=",
      "requires": {
        "tslib": "^1.9.0"
      }
@@ -1095,9 +1095,9 @@
      }
    },
    "@isa/remission": {
-      "version": "0.3.4",
-      "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@isa/remission/-/remission-0.3.4.tgz",
-      "integrity": "sha1-yL8OPs10DF8rdKq9C9nl1X6I/a4=",
+      "version": "0.3.6",
+      "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@isa/remission/-/remission-0.3.6.tgz",
+      "integrity": "sha1-y/FZgUDxkCdyXq9nS8AFBGuQ2cY=",
      "requires": {
        "tslib": "^1.9.0"
      }
--- a/package.json
+++ b/package.json
@@ -30,14 +30,14 @@
    "@angular/pwa": "^0.13.4",
    "@angular/router": "~7.2.12",
    "@angular/service-worker": "~7.2.12",
-    "@cmf/catalog-api": "^0.1.25",
-    "@cmf/core": "^0.1.25",
-    "@cmf/inventory-api": "^0.1.25",
-    "@cmf/trade-api": "^0.1.25",
+    "@cmf/catalog-api": "^0.1.26",
+    "@cmf/core": "^0.1.26",
+    "@cmf/inventory-api": "^0.1.26",
+    "@cmf/trade-api": "^0.1.26",
    "@isa/catsearch-api": "^0.0.53",
    "@isa/print-api": "0.0.53",
    "@isa/remi-api": "^0.0.53",
-    "@isa/remission": "^0.3.4",
+    "@isa/remission": "^0.3.6",
    "@ng-idle/core": "^8.0.0-beta.4",
    "@ng-idle/keepalive": "^8.0.0-beta.4",
    "@ngxs/store": "^3.4.1",