@colijnit/corecomponents_v12 258.1.2 → 258.1.4

package/fesm2015/colijnit-corecomponents_v12.js

@@ -6555,9 +6555,14 @@ class CalendarTemplateComponent {
     }
     selectDate(day) {
         if (day) {
-            this.selectedDate = day;
-            this._fillDatesBetweenSelected();
-            if (this.doubleCalendar) {
+            if (!this.doubleCalendar) {
+                // Single calendar → select and close
+                this.selectedDate = day;
+                this.setAndClose();
+            }
+            else {
+                this.selectedDate = day;
+                this._fillDatesBetweenSelected();
                 this.dateSelected.emit(new Date(this.selectedDate));
             }
         }
@@ -6757,8 +6762,8 @@ CalendarTemplateComponent.decorators = [
           </div>
         </div>
         <div class="calendar-action-buttons" *ngIf="showButtons">
-          <span class="set-and-close-button" (click)="setAndClose()">Instellen</span>
-          <span class="clear-date-button" (click)="clearDate()">Wissen</span>
+          <span class="set-and-close-button" *ngIf="this.doubleCalendar" (click)="setAndClose()">Instellen</span>
+          <span class="clear-date-button" *ngIf="this.selectedDate" (click)="clearDate()">Wissen</span>
           <span class="cancel-button" (click)="closeDate()">Annuleren</span>
         </div>
       </div>
@@ -12340,7 +12345,12 @@ class FilterItemComponent {
         let filterRange = [];
         this.collection.forEach((viewModel) => {
             if (viewModel.checked) {
-                filterRange.push(viewModel.code.toString());
+                if (typeof viewModel.code === 'string') {
+                    filterRange.push(viewModel.code.toString());
+                }
+                else if (typeof viewModel.code === 'number') {
+                    filterRange.push(viewModel.code);
+                }
             }
         });
         if (filterRange.length > 0) {
@@ -12471,11 +12481,11 @@ class FilterItemComponent {
         this._model = collectionModel;
         if (collectionModel !== null && collectionModel !== undefined && this.collection !== null && this.collection !== undefined) {
             this.collection.forEach((viewModel) => {
-                if (collectionModel.indexOf(viewModel.code.toString()) > -1) {
-                    viewModel.checked = true;
+                if (typeof collectionModel.indexOf(viewModel.code) === 'string') {
+                    viewModel.checked = collectionModel.indexOf(viewModel.code.toString()) > -1;
                 }
-                else {
-                    viewModel.checked = false;
+                else if (typeof collectionModel.indexOf(viewModel.code) === 'number') {
+                    viewModel.checked = collectionModel.indexOf(viewModel.code) > -1;
                 }
             });
         }