From a86037362557ace9f89dfeafaf209c1d177ae062 Mon Sep 17 00:00:00 2001
From: Teja Manthena <teja.manthena@cortado.com>
Date: Fri, 15 Dec 2023 17:16:10 +0100
Subject: [PATCH 1/2] Make Trays from Blob Capabilities available in Print
 Now/ezeep.js

---
 .../ezp-printer-selection.tsx                 | 35 +++++++++++++++++--
 src/data/locales/de.json                      |  5 ++-
 src/data/locales/en.json                      |  5 ++-
 src/shared/types.d.ts                         | 10 ++++++
 4 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/src/components/ezp-printer-selection/ezp-printer-selection.tsx b/src/components/ezp-printer-selection/ezp-printer-selection.tsx
index 52f42ea..8ccc849 100644
--- a/src/components/ezp-printer-selection/ezp-printer-selection.tsx
+++ b/src/components/ezp-printer-selection/ezp-printer-selection.tsx
@@ -84,6 +84,7 @@ export class EzpPrinterSelection {
     Resolutions: [],
     DuplexSupported: false,
     Color: false,
+    Trays: []
   }
 
   // needs to be initialised with empty strings
@@ -97,7 +98,9 @@ export class EzpPrinterSelection {
     copies: '',
     resolution: 0,
     paperlength : 0,
-    paperwidth : 0
+    paperwidth : 0,
+    defaultSource: '',
+    trayname: ''
   }
 
   @State() paperid: number | string
@@ -215,6 +218,10 @@ export class EzpPrinterSelection {
     this.printProcessing = true
     // we have to initialse this obj with empty strings to display the select component
     // but don't want to send any attributes with empty strings to the API
+    if (this.selectedPrinterConfig.Trays && this.selectedPrinterConfig.Trays.length >= 0 && this.selectedPrinterConfig.Trays[0] == null) {
+      delete this.selectedProperties.trayname
+      delete this.selectedProperties.defaultSource
+    }
     let cleanPrintProperties = removeEmptyStrings(this.selectedProperties)
     cleanPrintProperties = managePaperDimensions(cleanPrintProperties)
     // put it in store for further use
@@ -310,7 +317,7 @@ export class EzpPrinterSelection {
       } else {
         this.selectedPrinter = { id: '', location: '', name: '', is_queue: false }
         localStorage.removeItem('printer')
-        localStorage.removeItem('properties')
+        localStorage.removeItem('properties')  
       }
     } else {
       this.selectedPrinter = { id: '', location: '', name: '', is_queue: false }
@@ -376,6 +383,16 @@ export class EzpPrinterSelection {
         this.selectedProperties.paperwidth = eventDetails.value
         // console.log(this.selectedProperties)
         break
+      case 'tray':
+        if(this.selectedPrinterConfig.Trays && this.selectedPrinterConfig.Trays.length >= 0 && this.selectedPrinterConfig.Trays[0] == null) {
+          delete this.selectedProperties.trayname
+          delete this.selectedProperties.defaultSource
+        }
+        if(this.selectedPrinterConfig.Trays && this.selectedPrinterConfig.Trays.length >= 1 && this.selectedPrinterConfig.Trays[0] != null) {
+          this.selectedProperties.trayname = eventDetails.title
+          this.selectedProperties.defaultSource = eventDetails.id
+        }
+        break
       case 'duplex':
         if (eventDetails.title === 'None') {
           this.selectedProperties.duplex = false
@@ -781,6 +798,20 @@ export class EzpPrinterSelection {
                 preSelected={this.selectedPrinter.id ? this.selectedProperties.resolution : null}
                 disabled={!(this.selectedPrinterConfig.Resolutions.length > 0)}
               />
+             {this.selectedPrinterConfig.Trays.length >= 1 && this.selectedPrinterConfig.Trays[0] != null ? (
+              <ezp-select
+                label={i18next.t('printer_selection.trays')}
+                icon="size"
+                placeholder={i18next.t('printer_selection.select_trays')}
+                toggleFlow="horizontal"
+                optionFlow="horizontal"
+                options={this.selectedPrinterConfig.Trays.length >= 1 && this.selectedPrinterConfig.Trays.map((trays) => ({
+                  title: trays.Name,
+                  id: trays.Index,
+                  meta: '',
+                  type: 'tray',
+                }))}
+              /> ) : null}
             </div>
             <ezp-stepper label={i18next.t('printer_selection.copies')} max={10} icon="copies" />
           </div>
diff --git a/src/data/locales/de.json b/src/data/locales/de.json
index 3eaaf14..c57fd0d 100644
--- a/src/data/locales/de.json
+++ b/src/data/locales/de.json
@@ -42,7 +42,10 @@
         "duplex_short": "auf der kurzen Seite umdrehen",
         "pull_print_success": "Bereit zum Auslösen.",
         "width":"Breite",
-        "length":"Länge"
+        "length":"Länge",
+        "trays": "Trays",
+        "select_trays": "Wähle Trays",
+        "page_ranges": "Page Ranges"
     },
     "button_actions": {
         "login": "Anmelden",
diff --git a/src/data/locales/en.json b/src/data/locales/en.json
index 80cf3d4..ca154b1 100644
--- a/src/data/locales/en.json
+++ b/src/data/locales/en.json
@@ -42,7 +42,10 @@
         "no_printers": "No printers found.",
         "copies": "Copies",
         "width":"Width",
-        "length":"Length"
+        "length":"Length",
+        "trays": "Trays",
+        "select_trays": "Select Trays",
+        "page_ranges": "Page Ranges"
     },
     "button_actions": {
         "login": "Sign In",
diff --git a/src/shared/types.d.ts b/src/shared/types.d.ts
index 6174f25..c9c89be 100644
--- a/src/shared/types.d.ts
+++ b/src/shared/types.d.ts
@@ -64,6 +64,8 @@ export interface PrinterProperties {
   resolution?: string | number
   paperlength? : string | number
   paperwidth? : string | number
+  defaultSource?: number | string
+  trayname?: string 
 }
 
 export interface Printer {
@@ -79,6 +81,13 @@ export interface PaperFormat {
   XRes: number
   YRes: number
 }
+
+export interface Trays {
+  Default : boolean
+  Index:  number
+  Name: string
+}
+
 export interface PrinterConfig {
   Collate?: boolean
   Color?: boolean
@@ -95,6 +104,7 @@ export interface PrinterConfig {
   PaperFormats?: Array<PaperFormat>
   Resolutions?: Array<string>
   TPUID?: number
+  Trays?: Array<Trays>
 }
 
 export interface User {

From c041cc9e2095b5336bb0286e986bcec03e79b98f Mon Sep 17 00:00:00 2001
From: Teja Manthena <teja.manthena@cortado.com>
Date: Fri, 15 Dec 2023 19:15:55 +0100
Subject: [PATCH 2/2] Added icons for trays and page ranges

---
 src/components/ezp-icon/assets/glyph-paper_range.svg          | 1 +
 src/components/ezp-icon/assets/glyph-trays.svg                | 1 +
 .../ezp-printer-selection/ezp-printer-selection.tsx           | 4 ++--
 src/shared/types.d.ts                                         | 2 ++
 4 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 src/components/ezp-icon/assets/glyph-paper_range.svg
 create mode 100644 src/components/ezp-icon/assets/glyph-trays.svg

diff --git a/src/components/ezp-icon/assets/glyph-paper_range.svg b/src/components/ezp-icon/assets/glyph-paper_range.svg
new file mode 100644
index 0000000..9b3d08c
--- /dev/null
+++ b/src/components/ezp-icon/assets/glyph-paper_range.svg
@@ -0,0 +1 @@
+<svg fill="#646464" height="200px" width="200px" version="1.2" baseProfile="tiny" id="_x31_" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-63 65 128 128" xml:space="preserve" stroke="#646464"><g stroke-width="0"></g><g stroke-linecap="round" stroke-linejoin="round"></g><g id="SVGRepo_iconCarrier"> <path d="M-31.7,97.6h57.9v31.3h-57.9V97.6z M-31.7,136.8h57.3v5.2h-57.3V136.8z M-31.7,162.2h57.3v5.2h-57.3V162.2z M-31.7,149.2 h57.3v5.2h-57.3V149.2z M-33.1,70.8v10h-11.6v104.6h84.9v-10h11.6V70.8H-33.1z M34.9,170.2v5.2v4.8h-74.4V86h6.4h5.2H35L34.9,170.2 L34.9,170.2z M46.5,170.2h-6.4V80.8h-68V76h74.4V170.2z"></path> </g></svg>
\ No newline at end of file
diff --git a/src/components/ezp-icon/assets/glyph-trays.svg b/src/components/ezp-icon/assets/glyph-trays.svg
new file mode 100644
index 0000000..2112d96
--- /dev/null
+++ b/src/components/ezp-icon/assets/glyph-trays.svg
@@ -0,0 +1 @@
+<svg fill="#646464" viewBox="0 0 56 56" xmlns="http://www.w3.org/2000/svg" stroke="#646464" stroke-width="0.00056"><g stroke-width="0"></g><g stroke-linecap="round" stroke-linejoin="round"></g><g><path d="M 7.7148 48.0039 L 48.2852 48.0039 C 53.1836 48.0039 55.6446 45.5664 55.6446 40.7383 L 55.6446 26.8633 C 55.6446 24.7539 55.3398 23.6992 54.3088 22.4102 L 46.1992 12.4023 C 43.4569 9.0274 42.2382 7.9961 38.0898 7.9961 L 17.9101 7.9961 C 13.7617 7.9961 12.5429 9.0274 9.8007 12.4023 L 1.6913 22.4102 C .6601 23.6992 .3554 24.7539 .3554 26.8633 L .3554 40.7383 C .3554 45.5898 2.8398 48.0039 7.7148 48.0039 Z M 27.9882 33.0274 C 24.6835 33.0274 22.5507 30.1445 22.5507 27.4258 L 22.5507 27.3555 C 22.5507 26.3711 21.9648 25.4570 20.7695 25.4570 L 5.3007 25.4570 C 4.5273 25.4570 4.3632 24.7774 4.7617 24.2852 L 13.4570 13.3164 C 14.6288 11.8633 15.9413 11.2774 17.6523 11.2774 L 38.3476 11.2774 C 40.0585 11.2774 41.3710 11.8633 42.5430 13.3164 L 51.2382 24.2852 C 51.6366 24.7774 51.4724 25.4570 50.6992 25.4570 L 35.2304 25.4570 C 34.0351 25.4570 33.4492 26.3711 33.4492 27.3555 L 33.4492 27.4258 C 33.4492 30.1445 31.3163 33.0274 27.9882 33.0274 Z M 7.7851 44.2305 C 5.4413 44.2305 4.1288 42.9883 4.1288 40.5508 L 4.1288 28.8789 L 18.9882 28.8789 C 19.5741 33.2617 23.2304 36.4961 27.9882 36.4961 C 32.7460 36.4961 36.4257 33.2383 36.9882 28.8789 L 51.8708 28.8789 L 51.8708 40.5508 C 51.8708 42.9883 50.5350 44.2305 48.2147 44.2305 Z"></path></g></svg>
\ No newline at end of file
diff --git a/src/components/ezp-printer-selection/ezp-printer-selection.tsx b/src/components/ezp-printer-selection/ezp-printer-selection.tsx
index 6e6dcdd..f1056ab 100644
--- a/src/components/ezp-printer-selection/ezp-printer-selection.tsx
+++ b/src/components/ezp-printer-selection/ezp-printer-selection.tsx
@@ -812,7 +812,7 @@ export class EzpPrinterSelection {
              {this.selectedPrinterConfig.Trays.length >= 1 && this.selectedPrinterConfig.Trays[0] != null ? (
               <ezp-select
                 label={i18next.t('printer_selection.trays')}
-                icon="size"
+                icon="trays"
                 placeholder={i18next.t('printer_selection.select_trays')}
                 toggleFlow="horizontal"
                 optionFlow="horizontal"
@@ -824,7 +824,7 @@ export class EzpPrinterSelection {
                 }))}
               /> ) : null}
               <ezp-input
-                  icon="width"
+                  icon="paper_range"
                   suffix=""
                   placeholder="1-2,4-5,8"
                   value={this.selectedProperties.PageRanges}
diff --git a/src/shared/types.d.ts b/src/shared/types.d.ts
index 10bc5df..df64397 100644
--- a/src/shared/types.d.ts
+++ b/src/shared/types.d.ts
@@ -27,6 +27,8 @@ export type IconNameTypes =
   | 'size'
   | 'system'
   | 'width'
+  | 'paper_range'
+  | 'trays'
 export type IconSizeTypes = 'normal' | 'large' | 'huge'
 export type PrintOrganizationType = { id: number; name: string; printers: PrintPrinterType[] }
 export type PrintPrinterType = { id: number; name: string; location: string }