@colijnit/corecomponents_v12 259.1.4 → 259.1.6

package/fesm2015/colijnit-corecomponents_v12.js

@@ -17,7 +17,6 @@ import { CoDocument } from '@colijnit/mainapi/build/model/co-document.bo';
 import * as i1 from '@angular/cdk/overlay';
 import { OverlayConfig, Overlay } from '@angular/cdk/overlay';
 import { ComponentPortal } from '@angular/cdk/portal';
-import * as XLSX from 'xlsx';
 import { UserRightType } from '@colijnit/ioneconnector/build/enum/user-right-type.enum';
 import { ScrollingModule } from '@angular/cdk/scrolling';
 import { ArrayUtils as ArrayUtils$1 } from '@colijnit/ioneconnector/build/utils/array-utils';
@@ -1180,6 +1179,7 @@ var CoreComponentsIcon;
     CoreComponentsIcon["Orderpicking"] = "orderpicking";
     CoreComponentsIcon["OutgoingStorage"] = "outgoing_storage";
     CoreComponentsIcon["OverBooking"] = "over_booking";
+    CoreComponentsIcon["ParagraphSolid"] = "paragraph_solid";
     CoreComponentsIcon["PauseCircle"] = "pause_circle";
     CoreComponentsIcon["PencilRoundOpen"] = "pencil_round_open";
     CoreComponentsIcon["PenToSquareSolid"] = "pen_to_square_solid";
@@ -1483,6 +1483,7 @@ const CoreComponentsIconSvg = {
     "orderpicking": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 50 50\"><path d=\"M16.43,40.17c-.12-.16-2.92-4-1.53-8.21,1.33-4.08,6.25-9.69,6.46-9.84l.72-.55,2.28,2.83-1.45,1.17-1.13-1.39c-1.34,1.14-4.23,5.68-5.1,8.36C15.59,35.88,17.9,39,17.93,39l-1.5,1.13Z\" fill=\"#484f60\"/><path d=\"M27.86,41l-1.74-.66A17.68,17.68,0,0,0,27,32.56,63.51,63.51,0,0,0,25.5,25.1l-1.29-.38,1.27-4.35,1.05,2.26a81.55,81.55,0,0,1,2.28,9.64A19,19,0,0,1,27.86,41Z\" fill=\"#484f60\"/><path d=\"M34,39.94l-1.67-.83s1.9-3.88,1-6.39a36.83,36.83,0,0,0-4.84-8.51l-1.37,1.42-1.34-1.29,2.71-2.82.67.69c.2.2,4.84,6.82,5.93,9.89,1.16,3.25-1,7.65-1.1,7.84Z\" fill=\"#484f60\"/><rect x=\"22.91\" y=\"24.41\" width=\"4.48\" height=\"1.17\" fill=\"#484f60\"/><polygon points=\"23.52 9 23.52 20.93 23.93 21.44 25.28 16.78 26.7 19.85 26.7 9 23.52 9\" fill=\"#484f60\"/></svg>",
     "outgoing_storage": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 50 50\"><rect x=\"10\" y=\"12.36\" width=\"2.93\" height=\"25.61\" fill=\"#484f60\" opacity=\"0.5\"/><rect x=\"14.39\" y=\"30.65\" width=\"11.22\" height=\"1.46\" fill=\"#484f60\" opacity=\"0.5\"/><rect x=\"14.39\" y=\"21.87\" width=\"9.11\" height=\"1.46\" fill=\"#484f60\" opacity=\"0.5\"/><rect x=\"27.07\" y=\"29.46\" width=\"2.93\" height=\"8.51\" fill=\"#484f60\" opacity=\"0.5\"/><rect x=\"27.07\" y=\"12.36\" width=\"2.93\" height=\"8.51\" fill=\"#484f60\" opacity=\"0.5\"/><rect x=\"14.39\" y=\"13.09\" width=\"11.22\" height=\"1.46\" fill=\"#484f60\" opacity=\"0.5\"/><polygon points=\"40 25.16 32.62 17.79 32.62 22.38 25 22.38 25 27.96 32.62 27.96 32.62 32.55 40 25.16\" fill=\"#484f60\"/></svg>",
     "over_booking": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 50 50\"><polygon points=\"31.66 31 27.76 27.1 27.76 29.73 25.86 29.74 23.34 29.73 23.34 32.27 24.59 32.27 27.76 32.26 27.76 34.9 31.66 31\" fill=\"#484f60\"/><rect x=\"12.27\" y=\"30.23\" width=\"2.39\" height=\"4.77\" fill=\"#484f60\" opacity=\"0.75\"/><rect x=\"15.34\" y=\"30.23\" width=\"2.39\" height=\"4.77\" fill=\"#484f60\" opacity=\"0.75\"/><polygon points=\"21.34 27.73 22.5 27.73 22.5 23.41 15 20 7.5 23.41 7.5 35 10.91 35 10.91 28.86 19.09 28.86 19.09 35 22.5 35 22.5 34.27 21.34 34.27 21.34 27.73\" fill=\"#484f60\" opacity=\"0.75\"/><rect x=\"38.86\" y=\"28.64\" width=\"3.18\" height=\"6.36\" fill=\"#484f60\"/><polygon points=\"32.5 19.54 32.5 29.01 34.49 31 32.5 32.99 32.5 35 37.05 35 37.05 26.82 42.5 26.82 42.5 15 32.5 19.54\" fill=\"#484f60\"/></svg>",
+    "paragraph_solid": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 448 512\"><path d=\"M192 32l64 0 160 0c17.7 0 32 14.3 32 32s-14.3 32-32 32l-32 0 0 352c0 17.7-14.3 32-32 32s-32-14.3-32-32l0-352-32 0 0 352c0 17.7-14.3 32-32 32s-32-14.3-32-32l0-96-32 0c-88.4 0-160-71.6-160-160s71.6-160 160-160z\"/></svg>",
     "pause_circle": "<svg version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" x=\"0px\" y=\"0px\" viewBox=\"0 0 51 51\" enable-background=\"new 0 0 51 51\" ><g><g><path fill=\"#484F5F\" d=\"M23.5,18.5v14h-3.1v-14H23.5z M30.6,18.5v14h-3.1v-14H30.6z\"/></g><path fill=\"#484F5F\" d=\"M25.5,39.5c-7.7,0-14-6.3-14-14s6.3-14,14-14s14,6.3,14,14S33.2,39.5,25.5,39.5 M25.5,40.5c8.3,0,15-6.7,15-15c0-8.3-6.7-15-15-15c-8.3,0-15,6.7-15,15C10.5,33.8,17.2,40.5,25.5,40.5L25.5,40.5z\"/></g></svg>",
     "pencil_round_open": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 51 51\"><rect x=\"290.8\" y=\"419.4\" width=\"10.4\" height=\"0.49\" transform=\"translate(-482.6 -62.8) rotate(-45)\" fill=\"#fff\"/><rect x=\"292.6\" y=\"420\" width=\"10.4\" height=\"3.1\" transform=\"translate(-483.4 -60.6) rotate(-45)\" fill=\"#fff\"/><path d=\"M305.8,414.7l-2.1-2.1a0.8,0.8,0,0,0-1.1,0l-0.8.8,3.1,3.1,0.8-.8A0.8,0.8,0,0,0,305.8,414.7Z\" transform=\"translate(-272.5 -395)\" fill=\"#fff\"/><rect x=\"301.6\" y=\"414\" width=\"1.3\" height=\"4.44\" transform=\"translate(-478.3 -59.3) rotate(-45)\" fill=\"#fff\"/><polygon points=\"18.8 29.3 17.5 33.1 17.9 33.5 21.7 32.2 18.8 29.3\" fill=\"#fff\"/><path d=\"M298,436a15.5,15.5,0,1,1,15.5-15.5A15.5,15.5,0,0,1,298,436Zm0-30a14.5,14.5,0,1,0,14.5,14.5A14.5,14.5,0,0,0,298,406Z\" transform=\"translate(-272.5 -395)\" fill=\"#fff\"/></svg>",
     "pen_to_square_solid": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 512 512\"><path d=\"M490.3 40.4C512.2 62.27 512.2 97.73 490.3 119.6L460.3 149.7L362.3 51.72L392.4 21.66C414.3-.2135 449.7-.2135 471.6 21.66L490.3 40.4zM172.4 241.7L339.7 74.34L437.7 172.3L270.3 339.6C264.2 345.8 256.7 350.4 248.4 353.2L159.6 382.8C150.1 385.6 141.5 383.4 135 376.1C128.6 370.5 126.4 361 129.2 352.4L158.8 263.6C161.6 255.3 166.2 247.8 172.4 241.7V241.7zM192 63.1C209.7 63.1 224 78.33 224 95.1C224 113.7 209.7 127.1 192 127.1H96C78.33 127.1 64 142.3 64 159.1V416C64 433.7 78.33 448 96 448H352C369.7 448 384 433.7 384 416V319.1C384 302.3 398.3 287.1 416 287.1C433.7 287.1 448 302.3 448 319.1V416C448 469 405 512 352 512H96C42.98 512 0 469 0 416V159.1C0 106.1 42.98 63.1 96 63.1H192z\"/></svg>",
@@ -5492,14 +5493,14 @@ class InputDatePickerComponent extends BaseInputDatePickerDirective {
         this.setModelAsString();
     }
     setModelAsString() {
-        if (this.model) {
-            const year = this.model.toLocaleString("default", { year: "numeric" });
-            const month = this.model.toLocaleString("default", { month: "2-digit" });
-            const day = this.model.toLocaleString("default", { day: "2-digit" });
-            this.modelAsString = `${year}-${month}-${day}`;
+        if (this.model instanceof Date && !isNaN(this.model.getTime())) {
+            const y = this.model.getFullYear();
+            const m = String(this.model.getMonth() + 1).padStart(2, '0');
+            const d = String(this.model.getDate()).padStart(2, '0');
+            this.modelAsString = `${y}-${m}-${d}`;
         }
         else {
-            this.modelAsString = null;
+            this.modelAsString = null; // or leave as-is, but don't try to format a non-Date
         }
     }
     handleClearIconClicked() {
@@ -5525,7 +5526,8 @@ InputDatePickerComponent.decorators = [
                      (modelChange)="modelAsString = $event"
                      (clearIconClick)="handleClearIconClicked()"
                      [emptyPlace]="true"
-                     (keyup.enter)="finalizeDate()"
+                     (keydown.enter)="finalizeDate()"
+                     (keydown.tab)="finalizeDate()"
                      (blur)="finalizeDate()"
       ></co-input-text>
     `,
@@ -5884,6 +5886,7 @@ class InputTextComponent extends BaseInputComponent {
         event.preventDefault();
         event.stopPropagation();
         if (this.type === 'date') {
+            console.log(this.model);
             this.isFocusedOnDate = false;
         }
         this.isFocused.emit(false);
@@ -6440,43 +6443,42 @@ class CalendarTemplateComponent {
         this.daysToHighlight = [];
         this._initialSelectedDate = null;
     }
-    set selectedDate(date) {
-        this._selectedDate = !!date ? new Date(date.getFullYear(), date.getMonth(), date.getDate()) : date;
-        // Store the initial selected date when the calendar is first opened
+    set selectedDate(value) {
+        const d = this._coerceToDate(value);
+        this._selectedDate = d ? new Date(d.getFullYear(), d.getMonth(), d.getDate()) : null;
         if (this._initialSelectedDate === null) {
             this._initialSelectedDate = this._selectedDate;
         }
-        if (this.secondSelectedDate && date && this.secondSelectedDate.getTime() < this.selectedDate.getTime() && this.temporarySelectedSecondaryDate) {
+        if (this.secondSelectedDate && d && this.secondSelectedDate.getTime() < this.selectedDate.getTime() && this.temporarySelectedSecondaryDate) {
             this.daysToHighlight = [];
         }
     }
     get selectedDate() {
         return this._selectedDate;
     }
-    set secondSelectedDate(date) {
-        this._secondSelectedDate = !!date ? new Date(date.getFullYear(), date.getMonth(), date.getDate()) : date;
-        if (!this.selectedDate) {
+    set secondSelectedDate(value) {
+        const d = this._coerceToDate(value);
+        this._secondSelectedDate = d ? new Date(d.getFullYear(), d.getMonth(), d.getDate()) : null;
+        if (!this.selectedDate)
             this.daysToHighlight = [];
-        }
-        else {
+        else
             this._fillDatesBetweenSelected();
-        }
-    }
-    get secondSelectedDate() {
-        return this._secondSelectedDate;
     }
-    set secondHoveringDate(date) {
-        this._secondHoveringDate = date;
-        if (!!date) {
+    get secondSelectedDate() { return this._secondSelectedDate; }
+    set secondHoveringDate(value) {
+        const d = this._coerceToDate(value);
+        this._secondHoveringDate = d || null;
+        if (d)
             this.temporarySelectedSecondaryDate = null;
-        }
-        if (this.selectedDate && !this.secondSelectedDate) {
-            this.temporarySelectedSecondaryDate = new Date(date);
-        }
-        this.handleMouseOverDay(date);
+        if (this.selectedDate && !this.secondSelectedDate && d)
+            this.temporarySelectedSecondaryDate = new Date(d);
+        this.handleMouseOverDay(d);
     }
-    get secondHoveringDate() {
-        return this._secondHoveringDate;
+    _coerceToDate(v) {
+        if (v == null)
+            return null;
+        const d = v instanceof Date ? v : new Date(v);
+        return isNaN(d.getTime()) ? null : d;
     }
     showClass() {
         return true;
@@ -6569,10 +6571,10 @@ class CalendarTemplateComponent {
         this.yearSelectionYears = years.reverse();
     }
     openMonthSelection() {
-        this.showCalendarBody = false;
-        this.monthSelection = false;
-        this.yearSelection = true;
-        this.showMonthSelection = true;
+        this.showCalendarBody = !this.showCalendarBody;
+        this.monthSelection = !this.monthSelection;
+        this.yearSelection = !this.yearSelection;
+        this.showMonthSelection = !this.showMonthSelection;
     }
     openYearSelection() {
         this.showMonthSelection = false;
@@ -6730,15 +6732,15 @@ CalendarTemplateComponent.decorators = [
             <span *ngIf="!selectedDate" class="no-date-selected" [textContent]="'Selecteer datum'"></span>
         </div>
         <div class="calendar-header" *ngIf="monthSelection || yearSelection">
-          <co-icon class="calendar-change-month-button" [icon]="icons.ArrowPointLeft" (click)="prevMonth()"></co-icon>
+          <co-icon class="calendar-change-month-button" [icon]="icons.ArrowPointLeft" (click)="!monthSelection ? prevYear() : prevMonth()"></co-icon>
 
           <div class="calendar-header-title-wrapper">
             <span class="calendar-header-title" [textContent]="monthSelection ? monthHeader : yearHeader"
-                  (click)="monthSelection ? openMonthSelection() : openYearSelection()"
+                  (click)="openMonthSelection()"
             ></span>
           </div>
 
-          <co-icon class="calendar-change-month-button" [icon]="icons.ArrowPointRight" (click)="nextMonth()"></co-icon>
+          <co-icon class="calendar-change-month-button" [icon]="icons.ArrowPointRight" (click)="!monthSelection ? nextYear() : nextMonth()"></co-icon>
         </div>
 
         <div class="selection-grid month" *ngIf="showMonthSelection">
@@ -6855,6 +6857,116 @@ InputDatePickerModule.decorators = [
             },] }
 ];
 
+class BaseInputTimeDirective extends BaseInputComponent {
+    constructor() {
+        super(...arguments);
+        this.rightIcon = CoreComponentsIcon.Clock;
+        this.locale = 'nl-NL';
+        this.leftIconClick = new EventEmitter();
+        this.closeAfterDateSelection = true;
+    }
+}
+BaseInputTimeDirective.decorators = [
+    { type: Directive }
+];
+BaseInputTimeDirective.propDecorators = {
+    parentForOverlay: [{ type: ViewChild, args: ["parentForOverlay", { read: ElementRef },] }],
+    locale: [{ type: Input }],
+    placeholder: [{ type: Input }],
+    leftIcon: [{ type: Input }],
+    leftIconData: [{ type: Input }],
+    leftIconClick: [{ type: Output }],
+    closeAfterDateSelection: [{ type: Input }]
+};
+
+class InputTimeComponent extends BaseInputTimeDirective {
+    constructor() {
+        super(...arguments);
+        this.timeAsString = '';
+    }
+    modelSet() {
+        this.setTimeAsString();
+    }
+    setTimeAsString() {
+        if (this.model !== undefined && this.model !== null) {
+            const totalMinutes = Math.floor(this.model / (1000 * 60)); // Convert milliseconds to minutes
+            const days = Math.floor(totalMinutes / (24 * 60));
+            const hours = Math.floor((totalMinutes % (24 * 60)) / 60);
+            const minutes = totalMinutes % 60;
+            this.timeAsString = `${days}d ${hours}h ${minutes}m`;
+        }
+        else {
+            this.timeAsString = '';
+        }
+    }
+    handleTimeChange(value) {
+        if (value) {
+            const parts = value.split(' ');
+            let totalMinutes = 0;
+            parts.forEach(part => {
+                if (part.endsWith('d')) {
+                    totalMinutes += parseInt(part.substring(0, part.length - 1)) * 24 * 60;
+                }
+                else if (part.endsWith('h')) {
+                    totalMinutes += parseInt(part.substring(0, part.length - 1)) * 60;
+                }
+                else if (part.endsWith('m')) {
+                    totalMinutes += parseInt(part.substring(0, part.length - 1));
+                }
+            });
+            this.setModel(totalMinutes * 60 * 1000); // Convert minutes to milliseconds
+        }
+    }
+    handleClearIconClicked() {
+        this.setModel(undefined);
+    }
+}
+InputTimeComponent.decorators = [
+    { type: Component, args: [{
+                selector: 'co-input-time',
+                template: `
+    <co-input-text
+                   [hidden]="hidden"
+                   [readonly]="readonly"
+                   [(model)]="timeAsString"
+                   [rightIcon]="rightIcon"
+                   [leftIcon]="leftIcon"
+                   [leftIconData]="leftIconData"
+                   [placeholder]="placeholder"
+                   (blur)="handleTimeChange(timeAsString)"
+                   (clearIconClick)="handleClearIconClicked()"
+    ></co-input-text>
+  `,
+                providers: [
+                    OverlayService, {
+                        provide: SCREEN_CONFIG_ADAPTER_COMPONENT_INTERFACE_NAME, useExisting: forwardRef(() => InputTimeComponent)
+                    }, {
+                        provide: BaseInputTimeDirective,
+                        useExisting: InputTimeComponent
+                    }
+                ],
+                encapsulation: ViewEncapsulation.None
+            },] }
+];
+
+class InputTimeModule {
+}
+InputTimeModule.decorators = [
+    { type: NgModule, args: [{
+                imports: [
+                    CommonModule,
+                    InputTextModule,
+                    ClickoutsideModule,
+                    OverlayModule
+                ],
+                schemas: [
+                    NO_ERRORS_SCHEMA
+                ],
+                declarations: [InputTimeComponent],
+                exports: [InputTimeComponent]
+            },] }
+];
+
 class DoubleCalendarComponent extends BaseInputDatePickerDirective {
     constructor() {
         super(...arguments);
@@ -9381,138 +9493,12 @@ BaseSimpleGridComponent.propDecorators = {
     handleMouseUp: [{ type: HostListener, args: ['document:mouseup', ['$event'],] }]
 };
 
-class ExcelExportService {
-    /**
-     * Export data to Excel file
-     * @param data - Array of objects to export
-     * @param columns - Column configuration (optional)
-     * @param fileName - Name of the exported file
-     * @param sheetName - Name of the Excel sheet
-     */
-    exportToExcel(data, columns, fileName = 'export', sheetName = 'Sheet1') {
-        // If columns are specified, transform data to match column structure
-        let exportData = data;
-        if (columns && columns.length > 0) {
-            exportData = data.map(item => {
-                const newItem = {};
-                columns.forEach(col => {
-                    newItem[col.header] = this.getFlatValue(item, col.key);
-                });
-                return newItem;
-            });
-        }
-        // Create workbook and worksheet
-        const wb = XLSX.utils.book_new();
-        const ws = XLSX.utils.json_to_sheet(exportData);
-        // Set column widths if specified
-        if (columns && columns.some(col => col.width)) {
-            const colWidths = columns.map(col => ({ wch: col.width || 20 }));
-            ws['!cols'] = colWidths;
-        }
-        // Add worksheet to workbook
-        XLSX.utils.book_append_sheet(wb, ws, sheetName);
-        // Save file
-        XLSX.writeFile(wb, `${fileName}.xlsx`);
-    }
-    /**
-     * Export multiple sheets to one Excel file
-     * @param sheets - Array of sheet data
-     * @param fileName - Name of the exported file
-     */
-    exportMultipleSheets(sheets, fileName = 'multi-sheet-export') {
-        const wb = XLSX.utils.book_new();
-        sheets.forEach(sheet => {
-            let exportData = sheet.data;
-            if (sheet.columns && sheet.columns.length > 0) {
-                exportData = sheet.data.map(item => {
-                    const newItem = {};
-                    sheet.columns.forEach(col => {
-                        newItem[col.header] = this.getNestedValue(item, col.key);
-                    });
-                    return newItem;
-                });
-            }
-            const ws = XLSX.utils.json_to_sheet(exportData);
-            if (sheet.columns && sheet.columns.some(col => col.width)) {
-                const colWidths = sheet.columns.map(col => ({ wch: col.width || 20 }));
-                ws['!cols'] = colWidths;
-            }
-            XLSX.utils.book_append_sheet(wb, ws, sheet.sheetName);
-        });
-        XLSX.writeFile(wb, `${fileName}.xlsx`);
-    }
-    /**
-     * Export HTML table to Excel
-     * @param tableId - ID of the HTML table element
-     * @param fileName - Name of the exported file
-     * @param sheetName - Name of the Excel sheet
-     */
-    exportTableToExcel(tableId, fileName = 'table-export', sheetName = 'Sheet1') {
-        const table = document.getElementById(tableId);
-        if (!table) {
-            console.error(`Table with ID '${tableId}' not found`);
-            return;
-        }
-        const wb = XLSX.utils.book_new();
-        const ws = XLSX.utils.table_to_sheet(table);
-        XLSX.utils.book_append_sheet(wb, ws, sheetName);
-        XLSX.writeFile(wb, `${fileName}.xlsx`);
-    }
-    /**
-     * Get nested object value using dot notation
-     * @param obj - Object to search in
-     * @param path - Dot notation path (e.g., 'user.address.city')
-     */
-    getNestedValue(obj, path) {
-        return path.split('.').reduce((current, key) => {
-            return current && current[key] !== undefined ? current[key] : '';
-        }, obj);
-    }
-    getFlatValue(obj, key) {
-        return obj && obj[key] !== undefined ? obj[key] : '';
-    }
-    /**
-     * Format date for Excel export
-     * @param date - Date to format
-     * @param format - Format string (default: 'MM/DD/YYYY')
-     */
-    formatDateForExport(date, format = 'MM/DD/YYYY') {
-        if (!date) {
-            return '';
-        }
-        const d = new Date(date);
-        if (isNaN(d.getTime())) {
-            return '';
-        }
-        const month = (d.getMonth() + 1).toString().padStart(2, '0');
-        const day = d.getDate().toString().padStart(2, '0');
-        const year = d.getFullYear();
-        switch (format) {
-            case 'MM/DD/YYYY':
-                return `${month}/${day}/${year}`;
-            case 'DD/MM/YYYY':
-                return `${day}/${month}/${year}`;
-            case 'YYYY-MM-DD':
-                return `${year}-${month}-${day}`;
-            default:
-                return d.toLocaleDateString();
-        }
-    }
-}
-ExcelExportService.ɵprov = i0.ɵɵdefineInjectable({ factory: function ExcelExportService_Factory() { return new ExcelExportService(); }, token: ExcelExportService, providedIn: "root" });
-ExcelExportService.decorators = [
-    { type: Injectable, args: [{
-                providedIn: 'root'
-            },] }
-];
-
 class SimpleGridComponent extends BaseSimpleGridComponent {
-    constructor(icons, _changeDetection, _formMaster, excelExportService) {
+    constructor(icons, _changeDetection, _formMaster) {
         super();
         this.icons = icons;
         this._changeDetection = _changeDetection;
         this._formMaster = _formMaster;
-        this.excelExportService = excelExportService;
         this.defaultTextAlign = ColumnAlign.Left;
         this.showAdd = false;
         this.showDelete = false;
@@ -9881,6 +9867,18 @@ class SimpleGridComponent extends BaseSimpleGridComponent {
         //   'Sheet1'
         // );
     }
+    goToPreviousPage() {
+        this.currentPage -= 1;
+    }
+    goToNextPage() {
+        this.currentPage += 1;
+    }
+    setCurrentPage(page) {
+        this.currentPage = page;
+    }
+    get isNewRow() {
+        return this._newRow;
+    }
     _filterSelectedOrReturnAll(items) {
         const hasSelectedTrue = items.some(item => item.selected === true);
         return hasSelectedTrue ? items.filter(item => item.selected === true) : items;
@@ -10022,15 +10020,6 @@ class SimpleGridComponent extends BaseSimpleGridComponent {
         }
         this._detectChanges();
     }
-    goToPreviousPage() {
-        this.currentPage -= 1;
-    }
-    goToNextPage() {
-        this.currentPage += 1;
-    }
-    setCurrentPage(page) {
-        this.currentPage = page;
-    }
     _detectChanges() {
         this._changeDetection.detectChanges();
     }
@@ -10042,9 +10031,6 @@ class SimpleGridComponent extends BaseSimpleGridComponent {
         this.editing = false;
         this.rowToEdit = undefined;
     }
-    get isNewRow() {
-        return this._newRow;
-    }
 }
 SimpleGridComponent.decorators = [
     { type: Component, args: [{
@@ -10229,8 +10215,7 @@ SimpleGridComponent.decorators = [
 SimpleGridComponent.ctorParameters = () => [
     { type: IconCacheService },
     { type: ChangeDetectorRef },
-    { type: FormMasterService },
-    { type: ExcelExportService }
+    { type: FormMasterService }
 ];
 SimpleGridComponent.propDecorators = {
     headerCells: [{ type: ViewChildren, args: ['headerCell',] }],
@@ -11098,7 +11083,8 @@ ViewModeButtonsModule.decorators = [
 ];
 
 class ListOfValuesPopupComponent {
-    constructor(_elementRef) {
+    constructor(iconCacheService, _elementRef) {
+        this.iconCacheService = iconCacheService;
         this._elementRef = _elementRef;
         this.multiselect = false;
         this.displayField = 'description';
@@ -11310,6 +11296,8 @@ ListOfValuesPopupComponent.decorators = [
           (click)="selectViewModel(viewModel, !multiselect)"
           role="option">
           <ng-container *ngIf="!multiselect">
+              <co-icon *ngIf="viewModel.model[optionIcon]" class="input-text-left-icon" [iconData]="iconCacheService.getIcon(viewModel.model[optionIcon])">
+              </co-icon>
             <span class="lov-options-text" [textContent]="viewModel.model[displayField]"></span>
           </ng-container>
           <ng-container *ngIf="multiselect">
@@ -11325,6 +11313,7 @@ ListOfValuesPopupComponent.decorators = [
             },] }
 ];
 ListOfValuesPopupComponent.ctorParameters = () => [
+    { type: IconCacheService },
     { type: ElementRef }
 ];
 ListOfValuesPopupComponent.propDecorators = {
@@ -11338,6 +11327,7 @@ ListOfValuesPopupComponent.propDecorators = {
     customCssClass: [{ type: Input }],
     searchDisabled: [{ type: Input }],
     parentForOverlay: [{ type: Input }],
+    optionIcon: [{ type: Input }],
     collection: [{ type: Input }],
     modelChange: [{ type: Output }],
     closePopup: [{ type: Output }],
@@ -11346,9 +11336,10 @@ ListOfValuesPopupComponent.propDecorators = {
 };
 
 class ListOfValuesComponent extends BaseInputComponent {
-    constructor(formComponent, changeDetector, overlayService, componentFactoryResolver, formUserChangeListener, ngZoneWrapper, elementRef) {
+    constructor(formComponent, iconCacheService, changeDetector, overlayService, componentFactoryResolver, formUserChangeListener, ngZoneWrapper, elementRef) {
         super(changeDetector, componentFactoryResolver, overlayService, formUserChangeListener, ngZoneWrapper, elementRef);
         this.formComponent = formComponent;
+        this.iconCacheService = iconCacheService;
         this.changeDetector = changeDetector;
         this.overlayService = overlayService;
         this.componentFactoryResolver = componentFactoryResolver;
@@ -11486,7 +11477,8 @@ class ListOfValuesComponent extends BaseInputComponent {
             displayField: this.displayField,
             multiselect: this.multiselect,
             model: this.model,
-            collection: this.collection
+            collection: this.collection,
+            optionIcon: this.optionIcon,
         }, {
             modelChange: (value) => this.optionChosen(value),
             closePopup: () => this.closePopup(),
@@ -11583,7 +11575,7 @@ ListOfValuesComponent.decorators = [
               [disabled]="disabled"
               [required]="required"
               [noClickFocus]="false"
-              [leftIconData]="leftIconData"
+              [leftIconData]=" model && model[optionIcon] ? iconCacheService.getIcon(model[optionIcon]) : leftIconData"
               [rightIcon]="isSelectOpen ? icons.ChevronUpRegular : icons.ChevronDownRegular"
               [showClearButton]="true"
               [useContent]="multiselect"
@@ -11629,6 +11621,7 @@ ListOfValuesComponent.decorators = [
 ];
 ListOfValuesComponent.ctorParameters = () => [
     { type: FormComponent, decorators: [{ type: Optional }] },
+    { type: IconCacheService },
     { type: ChangeDetectorRef },
     { type: OverlayService },
     { type: ComponentFactoryResolver },
@@ -11642,6 +11635,7 @@ ListOfValuesComponent.propDecorators = {
     multiselect: [{ type: HostBinding, args: ['class.custom-height',] }, { type: HostBinding, args: ['class.multi-select',] }, { type: Input }],
     largeCollection: [{ type: Input }],
     displayField: [{ type: Input }],
+    optionIcon: [{ type: Input }],
     collection: [{ type: Input }],
     collectionLoadFn: [{ type: Input }],
     leftIconData: [{ type: Input }],
@@ -12405,6 +12399,10 @@ class FilterItemComponent {
                 this.showButton = true;
                 this._createModelForDateRange(model);
                 break;
+            case this.modes.DateField:
+                this.showButton = true;
+                this._createModelForDateField(model);
+                break;
             case this.modes.TextField:
                 this.showButton = true;
                 this._model = (typeof this._model === 'string' && this._model.length === 0) ? undefined : this._model;
@@ -12465,14 +12463,21 @@ class FilterItemComponent {
         });
     }
     onButtonClicked() {
-        var _a, _b;
-        if ((_a = this.dateInput) === null || _a === void 0 ? void 0 : _a.finalize) {
-            this.dateInput.finalize();
-        }
-        if ((_b = this.dateRangeInput) === null || _b === void 0 ? void 0 : _b.finalize) {
-            this.dateRangeInput.finalize();
-        }
-        this.filterButtonClicked.emit();
+        var _a, _b, _c, _d, _e, _f;
+        return __awaiter(this, void 0, void 0, function* () {
+            (_b = (_a = document.activeElement) === null || _a === void 0 ? void 0 : _a.blur) === null || _b === void 0 ? void 0 : _b.call(_a);
+            switch (this.mode) {
+                case this.modes.DateField:
+                    (_d = (_c = this.dateInput) === null || _c === void 0 ? void 0 : _c.finalize) === null || _d === void 0 ? void 0 : _d.call(_c);
+                    break;
+                case this.modes.DateRangeField:
+                    (_f = (_e = this.dateRangeInput) === null || _e === void 0 ? void 0 : _e.finalize) === null || _f === void 0 ? void 0 : _f.call(_e);
+                    break;
+            }
+            this._changeDetector.detectChanges();
+            yield Promise.resolve();
+            this.filterButtonClicked.emit();
+        });
     }
     uncheckForSingleSelect(model) {
         this.collection.forEach(m => {
@@ -12623,6 +12628,15 @@ class FilterItemComponent {
             this._model = 0;
         }
     }
+    _createModelForDateField(date) {
+        if (date) {
+            const formattedDate = this._formatDateToString(date);
+            this._model = `?='${formattedDate}'`;
+        }
+        else {
+            this._model = undefined;
+        }
+    }
     _createModelForDateRange(dates) {
         if (dates) {
             let startDate = dates[0];
@@ -12733,12 +12747,35 @@ class FilterItemComponent {
         }
     }
     _readModelForDateField(dateFieldModel) {
+        // Keep whatever came in as the "filter value" for outputs
         this._model = dateFieldModel;
-        if (dateFieldModel !== undefined && dateFieldModel !== null) {
-            this._model = new Date(dateFieldModel);
+        if (!dateFieldModel) {
+            this.dateFieldValue = undefined;
+            return;
         }
-        else {
-            this._model = undefined;
+        if (dateFieldModel instanceof Date) {
+            this.dateFieldValue = dateFieldModel;
+            return;
+        }
+        if (typeof dateFieldModel === 'string') {
+            // Accept "?='dd-MM-yyyy'", "dd-MM-yyyy", or "yyyy-MM-dd"
+            let raw = dateFieldModel;
+            const wrapped = raw.match(/\?='(\d{2}-\d{2}-\d{4})'/);
+            if (wrapped)
+                raw = wrapped[1];
+            const ddmmyyyy = /^(\d{2})-(\d{2})-(\d{4})$/;
+            const yyyymmdd = /^(\d{4})-(\d{2})-(\d{2})$/;
+            if (ddmmyyyy.test(raw)) {
+                const [, dd, mm, yyyy] = ddmmyyyy.exec(raw);
+                this.dateFieldValue = new Date(+yyyy, +mm - 1, +dd);
+            }
+            else if (yyyymmdd.test(raw)) {
+                const [, yyyy, mm, dd] = yyyymmdd.exec(raw);
+                this.dateFieldValue = new Date(+yyyy, +mm - 1, +dd);
+            }
+            else {
+                this.dateFieldValue = undefined;
+            }
         }
     }
     _readModelForDateRangeField(dateRangeFieldModel) {
@@ -12905,7 +12942,7 @@ FilterItemComponent.decorators = [
                       <div class="co-filter-item-dateField-content" *ngIf="mode === modes.DateField">
                           <co-input-date
                                   #dateInput
-                                  [(model)]="model" [readonly]="readonly"
+                                  [(model)]="dateFieldValue" [readonly]="readonly"
                                   (modelChange)="handleModelChange($event)"
                           ></co-input-date>
                       </div>
@@ -15054,5 +15091,5 @@ HourSchedulingExpandableComponentModule.decorators = [
  * Generated bundle index. Do not edit.
  */
 
-export { ArticleTileComponent, ArticleTileModule, BaseInputComponent, BaseInputDatePickerDirective, BaseModuleScreenConfigService, BaseModuleService, ButtonComponent, ButtonModule, CalendarComponent, CalendarModule, CardComponent, CardModule, Carousel3dComponent, Carousel3dModule, CarouselComponent, CarouselHammerConfig, CarouselModule, CheckmarkOverlayModule, ClickoutsideModule, CoDialogComponent, CoDialogModule, CoDialogWizardComponent, CoDialogWizardModule, CoDirection, CoOrientation, CollapsibleComponent, CollapsibleModule, ColorPickerComponent, ColorPickerModule, ColorSequenceService, ColumnAlign, ContentViewMode, CoreComponentsIcon, CoreComponentsTranslationModule, CoreComponentsTranslationService, CoreDialogModule, CoreDialogService, DoubleCalendarComponent, DoubleCalendarModule, FilterItemComponent, FilterItemMode, FilterItemModule, FilterItemViewmodel, FilterPipe, FilterPipeModule, FilterViewmodel, FormComponent, FormInputUserModelChangeListenerService, FormMasterService, FormModule, GridToolbarButtonComponent, GridToolbarButtonModule, GridToolbarComponent, GridToolbarModule, HourSchedulingComponent, HourSchedulingComponentModule, HourSchedulingExpandableComponent, HourSchedulingExpandableComponentModule, HourSchedulingExpandableTemplateComponent, IconCacheService, IconCollapseHandleComponent, IconCollapseHandleModule, IconComponent, IconModule, ImageComponent, ImageModule, InputCheckboxComponent, InputCheckboxModule, InputDatePickerComponent, InputDatePickerModule, InputDateRangePickerComponent, InputDateRangePickerModule, InputNumberPickerComponent, InputNumberPickerModule, InputRadioButtonComponent, InputRadioButtonModule, InputScannerComponent, InputScannerModule, InputSearchComponent, InputSearchModule, InputTextComponent, InputTextModule, InputTextareaComponent, InputTextareaModule, LevelIndicatorComponent, LevelIndicatorModule, ListOfIconsComponent, ListOfIconsModule, ListOfValuesComponent, ListOfValuesModule, ListOfValuesPopupComponent, LoaderComponent, LoaderModule, NgZoneWrapperService, ObserveVisibilityModule, OrientationOfDirection, OverlayModule, OverlayService, PaginationBarComponent, PaginationBarModule, PaginationComponent, PaginationModule, PopupButtonsComponent, PopupMessageDisplayComponent, PopupModule, PopupWindowShellComponent, PriceDisplayPipe, PriceDisplayPipeModule, PromptService, ResponsiveTextComponent, ResponsiveTextModule, SCREEN_CONFIG_ADAPTER_COMPONENT_INTERFACE_NAME, ScreenConfigurationDirective, ScreenConfigurationModule, SimpleGridColumnDirective, SimpleGridComponent, SimpleGridModule, TemplateWrapperDirective, TemplateWrapperModule, TextInputPopupComponent, TileComponent, TileModule, TileSelectComponent, TileSelectModule, TooltipDirectiveModule, ViewModeButtonsComponent, ViewModeButtonsModule, emailValidator, equalValidator, getValidatePasswordErrorString, maxStringLengthValidator, passwordValidator, precisionScaleValidator, requiredValidator, showHideDialog, InputBoolean as ɵa, RippleModule as ɵb, ObserveVisibilityDirective as ɵba, PaginationService as ɵbb, PaginatePipe as ɵbc, SimpleGridCellComponent as ɵbd, ListOfValuesMultiselectPopupComponent as ɵbe, ConfirmationDialogComponent as ɵbf, DialogBaseComponent as ɵbg, CoreDynamicComponentService as ɵbh, PrependPipeModule as ɵbi, PrependPipe as ɵbj, CheckmarkOverlayComponent as ɵbk, ScannerService as ɵbl, TooltipModule as ɵbm, TooltipComponent as ɵbn, TooltipDirective as ɵbo, HourSchedulingTestObjectComponent as ɵbp, MD_RIPPLE_GLOBAL_OPTIONS as ɵc, CoRippleDirective as ɵd, CoViewportRulerService as ɵe, CoScrollDispatcherService as ɵf, CoScrollableDirective as ɵg, StopClickModule as ɵh, StopClickDirective as ɵi, BaseModule as ɵj, AppendPipeModule as ɵk, AppendPipe as ɵl, ValidationErrorModule as ɵm, OverlayDirective as ɵn, OverlayParentDirective as ɵo, CoreLocalizePipe as ɵp, CoreDictionaryService as ɵq, ValidationErrorComponent as ɵr, CommitButtonsModule as ɵs, CommitButtonsComponent as ɵt, ClickOutsideDirective as ɵu, ClickOutsideMasterService as ɵv, CalendarTemplateComponent as ɵw, PopupShowerService as ɵx, BaseSimpleGridComponent as ɵy, ExcelExportService as ɵz };
+export { ArticleTileComponent, ArticleTileModule, BaseInputComponent, BaseInputDatePickerDirective, BaseModuleScreenConfigService, BaseModuleService, ButtonComponent, ButtonModule, CalendarComponent, CalendarModule, CardComponent, CardModule, Carousel3dComponent, Carousel3dModule, CarouselComponent, CarouselHammerConfig, CarouselModule, CheckmarkOverlayModule, ClickoutsideModule, CoDialogComponent, CoDialogModule, CoDialogWizardComponent, CoDialogWizardModule, CoDirection, CoOrientation, CollapsibleComponent, CollapsibleModule, ColorPickerComponent, ColorPickerModule, ColorSequenceService, ColumnAlign, ContentViewMode, CoreComponentsIcon, CoreComponentsTranslationModule, CoreComponentsTranslationService, CoreDialogModule, CoreDialogService, DoubleCalendarComponent, DoubleCalendarModule, FilterItemComponent, FilterItemMode, FilterItemModule, FilterItemViewmodel, FilterPipe, FilterPipeModule, FilterViewmodel, FormComponent, FormInputUserModelChangeListenerService, FormMasterService, FormModule, GridToolbarButtonComponent, GridToolbarButtonModule, GridToolbarComponent, GridToolbarModule, HourSchedulingComponent, HourSchedulingComponentModule, HourSchedulingExpandableComponent, HourSchedulingExpandableComponentModule, HourSchedulingExpandableTemplateComponent, IconCacheService, IconCollapseHandleComponent, IconCollapseHandleModule, IconComponent, IconModule, ImageComponent, ImageModule, InputCheckboxComponent, InputCheckboxModule, InputDatePickerComponent, InputDatePickerModule, InputDateRangePickerComponent, InputDateRangePickerModule, InputNumberPickerComponent, InputNumberPickerModule, InputRadioButtonComponent, InputRadioButtonModule, InputScannerComponent, InputScannerModule, InputSearchComponent, InputSearchModule, InputTextComponent, InputTextModule, InputTextareaComponent, InputTextareaModule, InputTimeComponent, InputTimeModule, LevelIndicatorComponent, LevelIndicatorModule, ListOfIconsComponent, ListOfIconsModule, ListOfValuesComponent, ListOfValuesModule, ListOfValuesPopupComponent, LoaderComponent, LoaderModule, NgZoneWrapperService, ObserveVisibilityModule, OrientationOfDirection, OverlayModule, OverlayService, PaginationBarComponent, PaginationBarModule, PaginationComponent, PaginationModule, PopupButtonsComponent, PopupMessageDisplayComponent, PopupModule, PopupWindowShellComponent, PriceDisplayPipe, PriceDisplayPipeModule, PromptService, ResponsiveTextComponent, ResponsiveTextModule, SCREEN_CONFIG_ADAPTER_COMPONENT_INTERFACE_NAME, ScreenConfigurationDirective, ScreenConfigurationModule, SimpleGridColumnDirective, SimpleGridComponent, SimpleGridModule, TemplateWrapperDirective, TemplateWrapperModule, TextInputPopupComponent, TileComponent, TileModule, TileSelectComponent, TileSelectModule, TooltipDirectiveModule, ViewModeButtonsComponent, ViewModeButtonsModule, emailValidator, equalValidator, getValidatePasswordErrorString, maxStringLengthValidator, passwordValidator, precisionScaleValidator, requiredValidator, showHideDialog, InputBoolean as ɵa, RippleModule as ɵb, ObserveVisibilityDirective as ɵba, PaginationService as ɵbb, PaginatePipe as ɵbc, SimpleGridCellComponent as ɵbd, ListOfValuesMultiselectPopupComponent as ɵbe, ConfirmationDialogComponent as ɵbf, DialogBaseComponent as ɵbg, CoreDynamicComponentService as ɵbh, PrependPipeModule as ɵbi, PrependPipe as ɵbj, CheckmarkOverlayComponent as ɵbk, ScannerService as ɵbl, TooltipModule as ɵbm, TooltipComponent as ɵbn, TooltipDirective as ɵbo, HourSchedulingTestObjectComponent as ɵbp, MD_RIPPLE_GLOBAL_OPTIONS as ɵc, CoRippleDirective as ɵd, CoViewportRulerService as ɵe, CoScrollDispatcherService as ɵf, CoScrollableDirective as ɵg, StopClickModule as ɵh, StopClickDirective as ɵi, BaseModule as ɵj, AppendPipeModule as ɵk, AppendPipe as ɵl, ValidationErrorModule as ɵm, OverlayDirective as ɵn, OverlayParentDirective as ɵo, CoreLocalizePipe as ɵp, CoreDictionaryService as ɵq, ValidationErrorComponent as ɵr, CommitButtonsModule as ɵs, CommitButtonsComponent as ɵt, ClickOutsideDirective as ɵu, ClickOutsideMasterService as ɵv, CalendarTemplateComponent as ɵw, BaseInputTimeDirective as ɵx, PopupShowerService as ɵy, BaseSimpleGridComponent as ɵz };
 //# sourceMappingURL=colijnit-corecomponents_v12.js.map