@colijnit/corecomponents_v12 258.1.3 → 258.1.5

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>
@@ -14682,7 +14687,14 @@ HourSchedulingExpandableComponent.propDecorators = {
 
 class HourSchedulingExpandableTemplateComponent {
     constructor() {
-        this.objects = [];
+        this.layouts = [];
+    }
+    set objects(objects) {
+        this._objects = objects;
+        this.layouts = this.calculateLeftAndWidthOfObjects();
+    }
+    get objects() {
+        return this._objects;
     }
     showClass() {
         return true;
@@ -14691,42 +14703,67 @@ class HourSchedulingExpandableTemplateComponent {
         onDragStartCustom === null || onDragStartCustom === void 0 ? void 0 : onDragStartCustom.call(obj);
         event.dataTransfer.setData("text", JSON.stringify({ obj }));
     }
-    leftForObject(index, objects) {
-        if (index === 0) {
-            return 0;
-        }
-        else {
-            return index * this.widthForObject(index, objects);
-        }
-    }
-    widthForObject(index, objects) {
-        if (objects.length > 1) {
-            return 100 / objects.length;
-        }
-        if (objects.length === 1) {
-            return 100;
-        }
+    calculateLeftAndWidthOfObjects() {
+        const layoutData = new Array(this._objects.length);
+        // Helper: check if two time ranges overlap
+        const isOverlapping = (startA, endA, startB, endB) => {
+            return startA < endB && startB < endA;
+        };
+        // Step 1: build overlap groups
+        const overlapGroups = [];
+        const processed = new Set();
+        for (let i = 0; i < this._objects.length; i++) {
+            if (processed.has(i))
+                continue;
+            const group = [i];
+            const objA = this._objects[i];
+            const startA = new Date(objA.start);
+            const endA = new Date(objA.end);
+            for (let j = i + 1; j < this._objects.length; j++) {
+                const objB = this._objects[j];
+                const startB = new Date(objB.start);
+                const endB = new Date(objB.end);
+                if (isOverlapping(startA, endA, startB, endB)) {
+                    group.push(j);
+                    processed.add(j);
+                }
+            }
+            group.forEach(index => processed.add(index));
+            overlapGroups.push(group);
+        }
+        // Step 2: assign layout per group
+        overlapGroups.forEach(group => {
+            const total = group.length;
+            const width = 100 / total;
+            group.forEach((objectIndex, i) => {
+                layoutData[objectIndex] = {
+                    leftPercent: i * width,
+                    widthPercent: width
+                };
+            });
+        });
+        return layoutData;
     }
 }
 HourSchedulingExpandableTemplateComponent.decorators = [
     { type: Component, args: [{
                 selector: "co-hour-scheduling-expandable-template",
                 template: `
-        <div class="row">
+       
             <div
                     *ngFor="let obj of objects"
                     [class]="'custom-scheduled-object'"
-                    [class.selected]="obj['selected']"
-                    [draggable]="!obj['selected']"
-                    [style.--height]="obj['height'] + 'px'"
-                    [style.--top]="obj['top'] + 'px'"
-                    [style.--left]="leftForObject(objects.indexOf(obj), objects) + '%'"
-                    [style.--width]="widthForObject(objects.indexOf(obj), objects) + '%'"
+                    [class.selected]="obj.selected"
+                    [draggable]="!obj.selected"
+                    [style.--height]="obj.height + 'px'"
+                    [style.--top]="obj.top + 'px'"
+                    [style.--left]="layouts[objects.indexOf(obj)].leftPercent + '%'"
+                    [style.--width]="layouts[objects.indexOf(obj)].widthPercent + '%'"
                     (click)="onSelectBlock(obj)"
                     (dragstart)="onExpandableDragStart($event, obj, onDragStartCustom(obj) )">
 
                 <div
-                        *ngIf="obj['selected']"
+                        *ngIf="obj.selected"
                         class="top-resizer"
                         (mousedown)="onResizeStart($event, obj, 'top')"></div>
                 <ng-template
@@ -14736,11 +14773,10 @@ HourSchedulingExpandableTemplateComponent.decorators = [
             }"
                 >
                 </ng-template>
-                <div *ngIf="obj['selected']"
+                <div *ngIf="obj.selected"
                      class="bottom-resizer"
                      (mousedown)="onResizeStart($event, obj, 'bottom')"></div>
             </div>
-        </div>
     `,
                 encapsulation: ViewEncapsulation.None
             },] }
@@ -14751,6 +14787,8 @@ HourSchedulingExpandableTemplateComponent.propDecorators = {
     onDragStartCustom: [{ type: Input }],
     onResizeStart: [{ type: Input }],
     onSelectBlock: [{ type: Input }],
+    startTimeProp: [{ type: Input }],
+    endTimeProp: [{ type: Input }],
     showClass: [{ type: HostBinding, args: ["class.co-hour-scheduling-expandable-template",] }]
 };