@colijnit/sharedcomponents 1.0.46 → 1.0.47

package/lib/components/key-pad/style/_layout.scss

@@ -5,32 +5,76 @@
     font-family: $sc-key-pad-font-family;
     font-size: $sc-key-pad-font-size;
     display: flex;
+    width: 100%;
+    aspect-ratio: 1/1;
     .key-pad-wrapper {
       display: flex;
+      width: 100%;
       flex-direction: column;
       row-gap: $sc-key-pad-button-gap;
       padding: $sc-key-pad-button-gap;
       border-radius: $sc-key-pad-border-radius;
     }
     .key-pad-model-wrapper {
+      position: relative;
       font-family: $sc-font-family-digital;
-      font-size: $sc-key-pad-model-font-size;
+      //font-size: $sc-key-pad-model-font-size;
       display: flex;
+      flex-basis: 10%;
       justify-content: flex-end;
       padding: $sc-key-pad-model-padding;
       box-shadow: inset 0px 0px 3px 1px darken($sc-key-pad-button-background-color, 30%);
     }
+    .co-scalable-text {
+      display: flex;
+      width: 100%;
+      justify-content: flex-end;
+    }
     .key-pad-model {
       user-select: none;
+      pointer-events: none;
+      display: block;
+      position: absolute;
+      width: 100%;
+      top: 50%;
+      transform: translateY(-50%);
+      //right: 10%;
+      //transform: translate(50%, -50%);
+      //foreignObject {
+      //  overflow: visible;
+      //}
+      svg {
+        position: relative;
+        width: 100%;
+      }
+      .text {
+        font-size: $sc-key-pad-model-font-size;
+        font-weight: bold;
+        /* display: flex; */
+        /* align-items: center; */
+        /* justify-content: flex-end; */
+        /* align-self: auto; */
+        position: absolute;
+        top: 50%;
+        right: 0;
+        transform: translateY(-50%);
+      }
+    }
+    .key-pad-button-flex-wrapper {
+      display: flex;
+      flex-basis: 100%;
     }
     .key-pad-button-wrapper {
       display: grid;
+      height: 100%;
+      width: 100%;
       grid-template-columns: $sc-key-pad-button-size $sc-key-pad-button-size $sc-key-pad-button-size $sc-key-pad-button-size;
       grid-template-rows: $sc-key-pad-button-size $sc-key-pad-button-size $sc-key-pad-button-size $sc-key-pad-button-size;
       row-gap: $sc-key-pad-button-gap;
       column-gap: $sc-key-pad-button-gap;
     }
     .key-pad-button {
+      position: relative;
       display: flex;
       align-items: center;
       justify-content: center;
@@ -41,6 +85,17 @@
         width: 45%;
         height: 45%;
       }
+      .key-pad-button-text {
+        position: absolute;
+      }
+      .text {
+        display: flex;
+        //width: 100%;
+        height: 100%;
+        align-items: center;
+        justify-content: center;
+        font-size: $sc-key-pad-button-font-size;
+      }
     }
     .button-7 {
       grid-column: 1 / 1;

package/lib/components/key-pad/style/_material-definition.scss

@@ -3,7 +3,7 @@ $sc-key-pad-model-font-family: $sc-font-family-digital !default;
 $sc-key-pad-font-size: $sc-font-size !default;
 $sc-key-pad-border-radius: 5px !default;
 
-$sc-key-pad-button-size: 40px !default;
+$sc-key-pad-button-size: 4fr !default;
 $sc-key-pad-button-gap: 10px !default;
 $sc-key-pad-button-border-radius: 5px !default;
 
@@ -11,7 +11,9 @@ $sc-key-pad-background-color: #d8d8d8 !default;
 $sc-key-pad-button-background-color: #555555 !default;
 $sc-key-pad-button-font-color: white !default;
 
-$sc-key-pad-model-font-size: 30px !default;
+$sc-key-pad-model-font-size: 12px !default;
 $sc-key-pad-model-padding: 10px !default;
 $sc-key-pad-model-font-color-positive: #00dc00 !default;
 $sc-key-pad-model-font-color-negative: red !default;
+
+$sc-key-pad-button-font-size: 20px !default;

package/lib/components/screen-config-generator/style/_layout.scss

@@ -3,6 +3,31 @@
     display: flex;
     overflow: auto;
     height: 93vh;
+    column-gap: 20px;
+
+    .tree-wrapper {
+
+      .tree-entry {
+        display: flex;
+        flex-direction: column;
+
+        span {
+          padding: 7px;
+          border: 1px solid #dddddd;
+          border-radius: 5px;
+          margin-bottom: 6px;
+          cursor: pointer;
+          background: #f6f6f6;
+        }
+
+        &.level2 {
+          margin-left: 25px;
+        }
+        &.level3 {
+          margin-left: 50px;
+        }
+      }
+    }
 
     .category-wrapper {
       display: flex;

package/lib/service/shared-connector.service.d.ts

@@ -27,6 +27,8 @@ export declare class SharedConnectorService {
     connect(): Promise<void>;
     getAllPrinters(): Promise<Printer[]>;
     getSendMethods(): Promise<SendMethod[]>;
+    getScreenConfigTree(): Promise<any>;
+    getScreenConfigSubRubric(parentRubricId: number, configId: number, fixedKey: string): Promise<any>;
     getStockHistory(request: GetStockHistoryRequest): Promise<StockHistoryBo[]>;
     getStockInformation(data: ArticleStock): Promise<ArticleStockBo[]>;
     getArtStockStatus(goodId: number, branchNo?: string, requestedAmount?: number, warehouseId?: number): Promise<number>;

package/lib/service/shared.service.d.ts

@@ -9,4 +9,6 @@ export declare class SharedService {
     init(options: any): Promise<void>;
     getAllPrinters(): Promise<Printer[]>;
     getSendMethods(): Promise<SendMethod[]>;
+    getScreenConfigTree(): Promise<any>;
+    getScreenConfigSubRubric(parentRubricId: number, configId: number, fixedKey: string): Promise<any>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colijnit/sharedcomponents",
-  "version": "1.0.46",
+  "version": "1.0.47",
   "private": false,
   "dependencies": {
     "chart.js": "4.3.0",
@@ -11,7 +11,7 @@
     "@angular/core": ">=12.2.0",
     "@colijnit/articleapi": ">=1.0.17",
     "@colijnit/mainapi": ">=1.0.15",
-    "@colijnit/corecomponents_v12": ">=12.1.0",
+    "@colijnit/corecomponents_v12": ">=12.1.4",
     "@colijnit/ioneconnector": ">=2.1.15",
     "@colijnit/sharedapi": ">=1.0.11",
     "pdf-lib": ">=1.17.1",