@acorex/modules 20.1.0 → 20.2.0-next.1

package/fesm2022/acorex-modules-calendar-management.mjs

@@ -1,6 +1,6 @@
 import { AXP_PERMISSION_DEFINITION_PROVIDER } from '@acorex/platform/auth';
-import { AXPSearchCommandProvider, AXP_MENU_PROVIDER, AXP_SEARCH_PROVIDER, createAllQueryView, AXPEntityQueryType, AXPEntityCommandScope } from '@acorex/platform/common';
-import { AXMEntityCrudServiceImpl, AXPEntityService, AXP_ENTITY_DEFINITION_LOADER, entityMasterCrudActions, entityMasterDeleteAction, entityDetailsSimpleCondition, entityDetailsCrudActions } from '@acorex/platform/layout/entity';
+import { AXPSearchCommandProvider, AXP_MENU_PROVIDER, AXP_SEARCH_PROVIDER, createAllQueryView, AXPEntityCommandScope, AXPEntityQueryType } from '@acorex/platform/common';
+import { AXMEntityCrudServiceImpl, AXPEntityService, AXP_ENTITY_DEFINITION_LOADER, entityDetailsCrudActions, entityMasterCrudActions, entityMasterDeleteAction, entityDetailsSimpleCondition } from '@acorex/platform/layout/entity';
 import { CommonModule } from '@angular/common';
 import * as i0 from '@angular/core';
 import { Injectable, inject, Injector, NgModule } from '@angular/core';
@@ -277,34 +277,22 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.3", ngImpor
                 }]
         }] });
 
-async function calendarFactory(injector) {
-    const dataService = injector.get(AXMCalendarService);
+async function calendarEventTypeFactory(injector) {
+    const dataService = injector.get(AXMCalendarEventTypeService);
     const i18n = RootConfig.config.i18n;
     const entityDef = {
         module: RootConfig.module.name,
-        name: RootConfig.entities.calendar.name,
+        name: RootConfig.entities.calendarEventType.name,
         source: '',
-        title: RootConfig.entities.calendar.title,
+        title: RootConfig.entities.calendarEventType.title,
         formats: {
-            individual: RootConfig.entities.calendar.title,
-            plural: RootConfig.entities.calendar.titlePlural,
+            individual: RootConfig.entities.calendarEventType.title,
+            plural: RootConfig.entities.calendarEventType.titlePlural,
             searchResult: {
                 title: '{{ title }}',
-                description: '{{ calendarType.title }}',
+                description: '{{ description }}',
             },
         },
-        //#region ----   Related Entities   ----
-        relatedEntities: [
-            {
-                entity: `${RootConfig.module.name}.${RootConfig.entities.calendarEvent.name}`,
-                title: RootConfig.entities.calendarEvent.titlePlural,
-                columns: ['date', 'typeId', 'title', 'isRecurring', 'isActive'],
-                conditions: [
-                    entityDetailsSimpleCondition('calendarId')
-                ],
-            },
-        ],
-        //#endregion
         //#region ----   Property Groups   ----
         groups: [
             {
@@ -312,16 +300,8 @@ async function calendarFactory(injector) {
                 title: '@general:terms.basic-info',
             },
             {
-                id: 'inheritance',
-                title: '@calendar-management:calendar.inheritance',
-            },
-            {
-                id: 'week-config',
-                title: '@calendar-management:calendar.week-configuration',
-            },
-            {
-                id: 'working-hours',
-                title: '@calendar-management:calendar.working-hours',
+                id: 'appearance',
+                title: '@general:terms.appearance',
             },
             {
                 id: 'settings',
@@ -348,7 +328,7 @@ async function calendarFactory(injector) {
                     interface: {
                         type: AXPWidgetsCatalog.text,
                         options: {
-                            placeholder: 'Enter calendar title',
+                            placeholder: 'Enter event type title',
                         },
                     },
                 },
@@ -373,73 +353,16 @@ async function calendarFactory(injector) {
                         type: AXPWidgetsCatalog.largeText,
                         options: {
                             rows: 3,
-                            placeholder: 'Enter calendar description',
-                        },
-                    },
-                },
-            },
-            {
-                name: 'calendarTypeId',
-                title: '@calendar-management:calendar.calendar-type',
-                groupId: 'basic-info',
-                options: {
-                    sort: { enabled: true },
-                    filter: {
-                        advance: { enabled: true },
-                        inline: { enabled: true },
-                    },
-                },
-                schema: {
-                    dataType: 'object',
-                    interface: {
-                        type: AXPWidgetsCatalog.select,
-                        options: {
-                            valueField: 'value',
-                            textField: 'text',
-                            multiple: false,
-                            dataSource: [
-                                { value: 'gregorian', text: 'Gregorian' },
-                                { value: 'solar-hijri', text: 'Solar Hijri' },
-                            ],
-                        },
-                    },
-                },
-                validations: [
-                    { rule: 'required' },
-                ],
-            },
-            // Inheritance
-            {
-                name: 'parentId',
-                title: '@calendar-management:calendar.parent-calendar',
-                groupId: 'inheritance',
-                options: {
-                    sort: { enabled: true },
-                    filter: {
-                        advance: { enabled: true },
-                        inline: { enabled: true },
-                    },
-                },
-                schema: {
-                    dataType: 'object',
-                    interface: {
-                        type: AXPWidgetsCatalog.lookup,
-                        options: {
-                            look: 'select',
-                            entity: `${RootConfig.module.name}.${RootConfig.entities.calendar.name}`,
-                            expose: [
-                                { source: 'id', target: 'parent.id' },
-                                { source: 'title', target: 'parent.title' },
-                            ],
+                            placeholder: 'Enter event type description',
                         },
                     },
                 },
             },
-            // Week Configuration
+            // Appearance
             {
-                name: 'weekends',
-                title: '@calendar-management:calendar.weekend-pattern',
-                groupId: 'week-config',
+                name: 'color',
+                title: '@general:terms.color',
+                groupId: 'appearance',
                 options: {
                     sort: { enabled: false },
                     filter: {
@@ -448,22 +371,11 @@ async function calendarFactory(injector) {
                     },
                 },
                 schema: {
-                    dataType: 'object',
+                    dataType: 'string',
                     interface: {
-                        type: AXPWidgetsCatalog.select,
+                        type: AXPWidgetsCatalog.color,
                         options: {
-                            valueField: 'id',
-                            textField: 'title',
-                            multiple: true,
-                            dataSource: [
-                                { id: 'sunday', title: 'Sunday' },
-                                { id: 'monday', title: 'Monday' },
-                                { id: 'tuesday', title: 'Tuesday' },
-                                { id: 'wednesday', title: 'Wednesday' },
-                                { id: 'thursday', title: 'Thursday' },
-                                { id: 'friday', title: 'Friday' },
-                                { id: 'saturday', title: 'Saturday' },
-                            ],
+                            format: 'hex',
                         },
                     },
                 },
@@ -472,67 +384,26 @@ async function calendarFactory(injector) {
                 ],
             },
             {
-                name: 'firstDayOfWeek',
-                title: '@calendar-management:calendar.first-day-of-week',
-                groupId: 'week-config',
+                name: 'icon',
+                title: '@general:terms.icon',
+                groupId: 'appearance',
                 options: {
-                    sort: { enabled: true },
+                    sort: { enabled: false },
                     filter: {
                         advance: { enabled: true },
-                        inline: { enabled: true },
+                        inline: { enabled: false },
                     },
                 },
                 schema: {
-                    dataType: 'object',
+                    dataType: 'string',
                     interface: {
-                        type: AXPWidgetsCatalog.select,
+                        type: AXPWidgetsCatalog.text,
                         options: {
-                            valueField: 'id',
-                            textField: 'title',
-                            multiple: false,
-                            dataSource: [
-                                { id: 'sunday', title: 'Sunday' },
-                                { id: 'monday', title: 'Monday' },
-                                { id: 'tuesday', title: 'Tuesday' },
-                                { id: 'wednesday', title: 'Wednesday' },
-                                { id: 'thursday', title: 'Thursday' },
-                                { id: 'friday', title: 'Friday' },
-                                { id: 'saturday', title: 'Saturday' },
-                            ],
+                            placeholder: 'fa-light fa-icon-name',
                         },
                     },
                 },
-                validations: [
-                    { rule: 'required' },
-                ],
             },
-            // // Working Hours
-            // {
-            //     name: 'workingHours',
-            //     title: '@calendar-management:calendar.working-hours-config',
-            //     groupId: 'working-hours',
-            //     options: {
-            //         sort: { enabled: false },
-            //         filter: {
-            //             advance: { enabled: false },
-            //             inline: { enabled: false },
-            //         },
-            //     },
-            //     schema: {
-            //         dataType: 'string',
-            //         interface: {
-            //             type: AXPWidgetsCatalog.flexLayout,
-            //             options: {
-            //                 rows: 5,
-            //                 placeholder: 'JSON configuration for working hours',
-            //             },
-            //             children:[
-            //                 {
-            //                 }
-            //             ]
-            //         },
-            //     },
-            // },
             // Settings
             {
                 name: 'isActive',
@@ -542,7 +413,7 @@ async function calendarFactory(injector) {
                     sort: { enabled: true },
                     filter: {
                         advance: { enabled: true },
-                        inline: { enabled: true },
+                        inline: { enabled: false },
                     },
                 },
                 schema: {
@@ -553,14 +424,14 @@ async function calendarFactory(injector) {
                 },
             },
             {
-                name: 'isTemplate',
-                title: '@calendar-management:calendar.is-template',
+                name: 'isDefault',
+                title: '@calendar-management:calendar-event-type.is-default',
                 groupId: 'settings',
                 options: {
                     sort: { enabled: true },
                     filter: {
                         advance: { enabled: true },
-                        inline: { enabled: true },
+                        inline: { enabled: false },
                     },
                 },
                 schema: {
@@ -597,12 +468,12 @@ async function calendarFactory(injector) {
         //#region ----   Table Columns   ----
         columns: [
             { name: 'title' },
-            { name: 'calendarTypeId', options: { dataPath: 'calendarType.title' } },
-            { name: 'parentId', options: { dataPath: 'parent.title' } },
-            { name: 'scopeType' },
-            { name: 'isTemplate' },
+            { name: 'color' },
+            { name: 'icon' },
+            { name: 'isDefault' },
             { name: 'isActive' },
         ],
+        //#endregion
         //#region ----   Commands   ----
         commands: {
             create: {
@@ -622,6 +493,7 @@ async function calendarFactory(injector) {
                 },
             },
         },
+        //#endregion
         //#region ----   Queries   ----
         queries: {
             byKey: {
@@ -644,105 +516,117 @@ async function calendarFactory(injector) {
                 create: {
                     sections: [
                         { id: 'basic-info' },
-                        { id: 'inheritance' },
-                        { id: 'week-config' },
-                        { id: 'working-hours' },
+                        { id: 'appearance' },
                         { id: 'settings' },
                     ],
                     properties: [
                         // Basic Info
                         { name: 'title', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
-                        { name: 'calendarTypeId', layout: { positions: { lg: { colSpan: 6, order: 3 } } } },
-                        { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 4 } } } },
-                        // Inheritance
-                        { name: 'parentId', layout: { positions: { lg: { colSpan: 12, order: 5 } } } },
-                        // Week Config
-                        { name: 'weekends', layout: { positions: { lg: { colSpan: 12, order: 8 } } } },
-                        { name: 'firstDayOfWeek', layout: { positions: { lg: { colSpan: 12, order: 9 } } } },
-                        // Working Hours
-                        //{ name: 'workingHours', layout: { positions: { lg: { colSpan: 12, order: 9 } } } },
+                        { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 3 } } } },
+                        // Appearance
+                        { name: 'color', layout: { positions: { lg: { colSpan: 6, order: 4 } } } },
+                        { name: 'icon', layout: { positions: { lg: { colSpan: 6, order: 5 } } } },
                         // Settings
-                        { name: 'isActive', layout: { positions: { lg: { colSpan: 4, order: 10 } } } },
-                        { name: 'isTemplate', layout: { positions: { lg: { colSpan: 4, order: 11 } } } },
-                        { name: 'order', layout: { positions: { lg: { colSpan: 4, order: 12 } } } },
+                        { name: 'isActive', layout: { positions: { lg: { colSpan: 4, order: 6 } } } },
+                        { name: 'isDefault', layout: { positions: { lg: { colSpan: 4, order: 7 } } } },
+                        { name: 'order', layout: { positions: { lg: { colSpan: 4, order: 8 } } } },
                     ],
                 },
                 update: {
                     sections: [
                         { id: 'basic-info' },
-                        { id: 'inheritance' },
-                        { id: 'week-config' },
-                        { id: 'working-hours' },
+                        { id: 'appearance' },
                         { id: 'settings' },
                     ],
                     properties: [
                         // Basic Info
                         { name: 'title', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
-                        { name: 'calendarTypeId', layout: { positions: { lg: { colSpan: 6, order: 3 } } } },
-                        { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 4 } } } },
-                        // Inheritance
-                        { name: 'parentId', layout: { positions: { lg: { colSpan: 12, order: 5 } } } },
-                        // Week Config
-                        { name: 'weekends', layout: { positions: { lg: { colSpan: 12, order: 8 } } } },
-                        { name: 'firstDayOfWeek', layout: { positions: { lg: { colSpan: 12, order: 9 } } } },
-                        // Working Hours
-                        //{ name: 'workingHours', layout: { positions: { lg: { colSpan: 12, order: 9 } } } },
+                        { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 3 } } } },
+                        // Appearance
+                        { name: 'color', layout: { positions: { lg: { colSpan: 6, order: 4 } } } },
+                        { name: 'icon', layout: { positions: { lg: { colSpan: 6, order: 5 } } } },
                         // Settings
-                        { name: 'isActive', layout: { positions: { lg: { colSpan: 4, order: 10 } } } },
-                        { name: 'isTemplate', layout: { positions: { lg: { colSpan: 4, order: 11 } } } },
-                        { name: 'order', layout: { positions: { lg: { colSpan: 4, order: 12 } } } },
+                        { name: 'isActive', layout: { positions: { lg: { colSpan: 4, order: 6 } } } },
+                        { name: 'isDefault', layout: { positions: { lg: { colSpan: 4, order: 7 } } } },
+                        { name: 'order', layout: { positions: { lg: { colSpan: 4, order: 8 } } } },
                     ],
                 },
                 single: {
                     title: '{{title}}',
                     sections: [
                         { id: 'basic-info' },
-                        { id: 'inheritance' },
-                        { id: 'week-config' },
-                        { id: 'working-hours' },
+                        { id: 'appearance' },
                         { id: 'settings' },
                     ],
                     properties: [
                         // Basic Info
                         { name: 'title', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
-                        { name: 'calendarTypeId', layout: { positions: { lg: { colSpan: 6, order: 3 } } }, dataPath: 'calendarType.title' },
-                        { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 4 } } } },
-                        // Inheritance
-                        { name: 'parentId', layout: { positions: { lg: { colSpan: 12, order: 5 } } } },
-                        // Week Config
-                        { name: 'weekends', layout: { positions: { lg: { colSpan: 12, order: 8 } } } },
-                        { name: 'firstDayOfWeek', layout: { positions: { lg: { colSpan: 12, order: 9 } } } },
-                        // Working Hours
-                        //{ name: 'workingHours', layout: { positions: { lg: { colSpan: 12, order: 9 } } } },
+                        { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 3 } } } },
+                        // Appearance
+                        { name: 'color', layout: { positions: { lg: { colSpan: 6, order: 4 } } } },
+                        { name: 'icon', layout: { positions: { lg: { colSpan: 6, order: 5 } } } },
                         // Settings
-                        { name: 'isActive', layout: { positions: { lg: { colSpan: 4, order: 10 } } } },
-                        { name: 'isTemplate', layout: { positions: { lg: { colSpan: 4, order: 11 } } } },
-                        { name: 'order', layout: { positions: { lg: { colSpan: 4, order: 12 } } } },
+                        { name: 'isActive', layout: { positions: { lg: { colSpan: 4, order: 6 } } } },
+                        { name: 'isDefault', layout: { positions: { lg: { colSpan: 4, order: 7 } } } },
+                        { name: 'order', layout: { positions: { lg: { colSpan: 4, order: 8 } } } },
                     ],
                     actions: [
-                        entityMasterDeleteAction()
+                        {
+                            title: '@general:actions.delete.title',
+                            command: 'delete-entity',
+                            priority: 'secondary',
+                            type: 'delete',
+                            scope: AXPEntityCommandScope.Individual,
+                        },
                     ],
                 },
                 list: {
                     actions: [
-                        ...entityMasterCrudActions()
+                        {
+                            title: '@general:actions.create.title',
+                            command: 'create-entity',
+                            priority: 'primary',
+                            type: 'create',
+                            scope: AXPEntityCommandScope.TypeLevel,
+                        },
+                        {
+                            title: '@general:actions.delete-items.title',
+                            command: 'delete-entity',
+                            priority: 'primary',
+                            type: 'delete',
+                            scope: AXPEntityCommandScope.Selected,
+                        },
+                        {
+                            title: '@general:actions.detail.title',
+                            command: 'open-entity',
+                            priority: 'secondary',
+                            type: 'view',
+                            scope: AXPEntityCommandScope.Individual,
+                        },
+                        {
+                            title: '@general:actions.delete.title',
+                            command: 'delete-entity',
+                            priority: 'secondary',
+                            type: 'delete',
+                            scope: AXPEntityCommandScope.Individual,
+                        },
                     ],
                     views: [
                         createAllQueryView({
-                            sorts: [{ name: 'title', dir: 'asc' }]
+                            sorts: [{ name: 'order', dir: 'asc' }]
                         }),
                     ],
                 },
             },
         },
-        //#endregion    
+        //#endregion
     };
     return entityDef;
 }
 
-var calendar_entity = /*#__PURE__*/Object.freeze({
+var calendarEventType_entity = /*#__PURE__*/Object.freeze({
     __proto__: null,
-    calendarFactory: calendarFactory
+    calendarEventTypeFactory: calendarEventTypeFactory
 });
 
 async function calendarEventFactory(injector) {
@@ -1147,22 +1031,34 @@ var calendarEvent_entity = /*#__PURE__*/Object.freeze({
     calendarEventFactory: calendarEventFactory
 });
 
-async function calendarEventTypeFactory(injector) {
-    const dataService = injector.get(AXMCalendarEventTypeService);
+async function calendarFactory(injector) {
+    const dataService = injector.get(AXMCalendarService);
     const i18n = RootConfig.config.i18n;
     const entityDef = {
         module: RootConfig.module.name,
-        name: RootConfig.entities.calendarEventType.name,
+        name: RootConfig.entities.calendar.name,
         source: '',
-        title: RootConfig.entities.calendarEventType.title,
+        title: RootConfig.entities.calendar.title,
         formats: {
-            individual: RootConfig.entities.calendarEventType.title,
-            plural: RootConfig.entities.calendarEventType.titlePlural,
+            individual: RootConfig.entities.calendar.title,
+            plural: RootConfig.entities.calendar.titlePlural,
             searchResult: {
                 title: '{{ title }}',
-                description: '{{ description }}',
+                description: '{{ calendarType.title }}',
             },
         },
+        //#region ----   Related Entities   ----
+        relatedEntities: [
+            {
+                entity: `${RootConfig.module.name}.${RootConfig.entities.calendarEvent.name}`,
+                title: RootConfig.entities.calendarEvent.titlePlural,
+                columns: ['date', 'typeId', 'title', 'isRecurring', 'isActive'],
+                conditions: [
+                    entityDetailsSimpleCondition('calendarId')
+                ],
+            },
+        ],
+        //#endregion
         //#region ----   Property Groups   ----
         groups: [
             {
@@ -1170,8 +1066,16 @@ async function calendarEventTypeFactory(injector) {
                 title: '@general:terms.basic-info',
             },
             {
-                id: 'appearance',
-                title: '@general:terms.appearance',
+                id: 'inheritance',
+                title: '@calendar-management:calendar.inheritance',
+            },
+            {
+                id: 'week-config',
+                title: '@calendar-management:calendar.week-configuration',
+            },
+            {
+                id: 'working-hours',
+                title: '@calendar-management:calendar.working-hours',
             },
             {
                 id: 'settings',
@@ -1198,7 +1102,7 @@ async function calendarEventTypeFactory(injector) {
                     interface: {
                         type: AXPWidgetsCatalog.text,
                         options: {
-                            placeholder: 'Enter event type title',
+                            placeholder: 'Enter calendar title',
                         },
                     },
                 },
@@ -1223,29 +1127,34 @@ async function calendarEventTypeFactory(injector) {
                         type: AXPWidgetsCatalog.largeText,
                         options: {
                             rows: 3,
-                            placeholder: 'Enter event type description',
+                            placeholder: 'Enter calendar description',
                         },
                     },
                 },
             },
-            // Appearance
             {
-                name: 'color',
-                title: '@general:terms.color',
-                groupId: 'appearance',
+                name: 'calendarTypeId',
+                title: '@calendar-management:calendar.calendar-type',
+                groupId: 'basic-info',
                 options: {
-                    sort: { enabled: false },
+                    sort: { enabled: true },
                     filter: {
                         advance: { enabled: true },
-                        inline: { enabled: false },
+                        inline: { enabled: true },
                     },
                 },
                 schema: {
-                    dataType: 'string',
+                    dataType: 'object',
                     interface: {
-                        type: AXPWidgetsCatalog.color,
+                        type: AXPWidgetsCatalog.select,
                         options: {
-                            format: 'hex',
+                            valueField: 'value',
+                            textField: 'text',
+                            multiple: false,
+                            dataSource: [
+                                { value: 'gregorian', text: 'Gregorian' },
+                                { value: 'solar-hijri', text: 'Solar Hijri' },
+                            ],
                         },
                     },
                 },
@@ -1253,10 +1162,38 @@ async function calendarEventTypeFactory(injector) {
                     { rule: 'required' },
                 ],
             },
+            // Inheritance
             {
-                name: 'icon',
-                title: '@general:terms.icon',
-                groupId: 'appearance',
+                name: 'parentId',
+                title: '@calendar-management:calendar.parent-calendar',
+                groupId: 'inheritance',
+                options: {
+                    sort: { enabled: true },
+                    filter: {
+                        advance: { enabled: true },
+                        inline: { enabled: true },
+                    },
+                },
+                schema: {
+                    dataType: 'object',
+                    interface: {
+                        type: AXPWidgetsCatalog.lookup,
+                        options: {
+                            look: 'select',
+                            entity: `${RootConfig.module.name}.${RootConfig.entities.calendar.name}`,
+                            expose: [
+                                { source: 'id', target: 'parent.id' },
+                                { source: 'title', target: 'parent.title' },
+                            ],
+                        },
+                    },
+                },
+            },
+            // Week Configuration
+            {
+                name: 'weekends',
+                title: '@calendar-management:calendar.weekend-pattern',
+                groupId: 'week-config',
                 options: {
                     sort: { enabled: false },
                     filter: {
@@ -1265,15 +1202,91 @@ async function calendarEventTypeFactory(injector) {
                     },
                 },
                 schema: {
-                    dataType: 'string',
+                    dataType: 'object',
                     interface: {
-                        type: AXPWidgetsCatalog.text,
+                        type: AXPWidgetsCatalog.select,
                         options: {
-                            placeholder: 'fa-light fa-icon-name',
+                            valueField: 'id',
+                            textField: 'title',
+                            multiple: true,
+                            dataSource: [
+                                { id: 'sunday', title: 'Sunday' },
+                                { id: 'monday', title: 'Monday' },
+                                { id: 'tuesday', title: 'Tuesday' },
+                                { id: 'wednesday', title: 'Wednesday' },
+                                { id: 'thursday', title: 'Thursday' },
+                                { id: 'friday', title: 'Friday' },
+                                { id: 'saturday', title: 'Saturday' },
+                            ],
                         },
                     },
                 },
+                validations: [
+                    { rule: 'required' },
+                ],
             },
+            {
+                name: 'firstDayOfWeek',
+                title: '@calendar-management:calendar.first-day-of-week',
+                groupId: 'week-config',
+                options: {
+                    sort: { enabled: true },
+                    filter: {
+                        advance: { enabled: true },
+                        inline: { enabled: true },
+                    },
+                },
+                schema: {
+                    dataType: 'object',
+                    interface: {
+                        type: AXPWidgetsCatalog.select,
+                        options: {
+                            valueField: 'id',
+                            textField: 'title',
+                            multiple: false,
+                            dataSource: [
+                                { id: 'sunday', title: 'Sunday' },
+                                { id: 'monday', title: 'Monday' },
+                                { id: 'tuesday', title: 'Tuesday' },
+                                { id: 'wednesday', title: 'Wednesday' },
+                                { id: 'thursday', title: 'Thursday' },
+                                { id: 'friday', title: 'Friday' },
+                                { id: 'saturday', title: 'Saturday' },
+                            ],
+                        },
+                    },
+                },
+                validations: [
+                    { rule: 'required' },
+                ],
+            },
+            // // Working Hours
+            // {
+            //     name: 'workingHours',
+            //     title: '@calendar-management:calendar.working-hours-config',
+            //     groupId: 'working-hours',
+            //     options: {
+            //         sort: { enabled: false },
+            //         filter: {
+            //             advance: { enabled: false },
+            //             inline: { enabled: false },
+            //         },
+            //     },
+            //     schema: {
+            //         dataType: 'string',
+            //         interface: {
+            //             type: AXPWidgetsCatalog.flexLayout,
+            //             options: {
+            //                 rows: 5,
+            //                 placeholder: 'JSON configuration for working hours',
+            //             },
+            //             children:[
+            //                 {
+            //                 }
+            //             ]
+            //         },
+            //     },
+            // },
             // Settings
             {
                 name: 'isActive',
@@ -1283,7 +1296,7 @@ async function calendarEventTypeFactory(injector) {
                     sort: { enabled: true },
                     filter: {
                         advance: { enabled: true },
-                        inline: { enabled: false },
+                        inline: { enabled: true },
                     },
                 },
                 schema: {
@@ -1294,14 +1307,14 @@ async function calendarEventTypeFactory(injector) {
                 },
             },
             {
-                name: 'isDefault',
-                title: '@calendar-management:calendar-event-type.is-default',
+                name: 'isTemplate',
+                title: '@calendar-management:calendar.is-template',
                 groupId: 'settings',
                 options: {
                     sort: { enabled: true },
                     filter: {
                         advance: { enabled: true },
-                        inline: { enabled: false },
+                        inline: { enabled: true },
                     },
                 },
                 schema: {
@@ -1338,12 +1351,12 @@ async function calendarEventTypeFactory(injector) {
         //#region ----   Table Columns   ----
         columns: [
             { name: 'title' },
-            { name: 'color' },
-            { name: 'icon' },
-            { name: 'isDefault' },
+            { name: 'calendarTypeId', options: { dataPath: 'calendarType.title' } },
+            { name: 'parentId', options: { dataPath: 'parent.title' } },
+            { name: 'scopeType' },
+            { name: 'isTemplate' },
             { name: 'isActive' },
         ],
-        //#endregion
         //#region ----   Commands   ----
         commands: {
             create: {
@@ -1363,7 +1376,6 @@ async function calendarEventTypeFactory(injector) {
                 },
             },
         },
-        //#endregion
         //#region ----   Queries   ----
         queries: {
             byKey: {
@@ -1386,124 +1398,150 @@ async function calendarEventTypeFactory(injector) {
                 create: {
                     sections: [
                         { id: 'basic-info' },
-                        { id: 'appearance' },
+                        { id: 'inheritance' },
+                        { id: 'week-config' },
+                        { id: 'working-hours' },
                         { id: 'settings' },
                     ],
                     properties: [
                         // Basic Info
                         { name: 'title', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
-                        { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 3 } } } },
-                        // Appearance
-                        { name: 'color', layout: { positions: { lg: { colSpan: 6, order: 4 } } } },
-                        { name: 'icon', layout: { positions: { lg: { colSpan: 6, order: 5 } } } },
+                        { name: 'calendarTypeId', layout: { positions: { lg: { colSpan: 6, order: 3 } } } },
+                        { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 4 } } } },
+                        // Inheritance
+                        { name: 'parentId', layout: { positions: { lg: { colSpan: 12, order: 5 } } } },
+                        // Week Config
+                        { name: 'weekends', layout: { positions: { lg: { colSpan: 12, order: 8 } } } },
+                        { name: 'firstDayOfWeek', layout: { positions: { lg: { colSpan: 12, order: 9 } } } },
+                        // Working Hours
+                        //{ name: 'workingHours', layout: { positions: { lg: { colSpan: 12, order: 9 } } } },
                         // Settings
-                        { name: 'isActive', layout: { positions: { lg: { colSpan: 4, order: 6 } } } },
-                        { name: 'isDefault', layout: { positions: { lg: { colSpan: 4, order: 7 } } } },
-                        { name: 'order', layout: { positions: { lg: { colSpan: 4, order: 8 } } } },
+                        { name: 'isActive', layout: { positions: { lg: { colSpan: 4, order: 10 } } } },
+                        { name: 'isTemplate', layout: { positions: { lg: { colSpan: 4, order: 11 } } } },
+                        { name: 'order', layout: { positions: { lg: { colSpan: 4, order: 12 } } } },
                     ],
                 },
                 update: {
                     sections: [
                         { id: 'basic-info' },
-                        { id: 'appearance' },
+                        { id: 'inheritance' },
+                        { id: 'week-config' },
+                        { id: 'working-hours' },
                         { id: 'settings' },
                     ],
                     properties: [
                         // Basic Info
                         { name: 'title', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
-                        { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 3 } } } },
-                        // Appearance
-                        { name: 'color', layout: { positions: { lg: { colSpan: 6, order: 4 } } } },
-                        { name: 'icon', layout: { positions: { lg: { colSpan: 6, order: 5 } } } },
+                        { name: 'calendarTypeId', layout: { positions: { lg: { colSpan: 6, order: 3 } } } },
+                        { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 4 } } } },
+                        // Inheritance
+                        { name: 'parentId', layout: { positions: { lg: { colSpan: 12, order: 5 } } } },
+                        // Week Config
+                        { name: 'weekends', layout: { positions: { lg: { colSpan: 12, order: 8 } } } },
+                        { name: 'firstDayOfWeek', layout: { positions: { lg: { colSpan: 12, order: 9 } } } },
+                        // Working Hours
+                        //{ name: 'workingHours', layout: { positions: { lg: { colSpan: 12, order: 9 } } } },
                         // Settings
-                        { name: 'isActive', layout: { positions: { lg: { colSpan: 4, order: 6 } } } },
-                        { name: 'isDefault', layout: { positions: { lg: { colSpan: 4, order: 7 } } } },
-                        { name: 'order', layout: { positions: { lg: { colSpan: 4, order: 8 } } } },
+                        { name: 'isActive', layout: { positions: { lg: { colSpan: 4, order: 10 } } } },
+                        { name: 'isTemplate', layout: { positions: { lg: { colSpan: 4, order: 11 } } } },
+                        { name: 'order', layout: { positions: { lg: { colSpan: 4, order: 12 } } } },
                     ],
                 },
                 single: {
                     title: '{{title}}',
                     sections: [
                         { id: 'basic-info' },
-                        { id: 'appearance' },
+                        { id: 'inheritance' },
+                        { id: 'week-config' },
+                        { id: 'working-hours' },
                         { id: 'settings' },
                     ],
                     properties: [
                         // Basic Info
                         { name: 'title', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
-                        { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 3 } } } },
-                        // Appearance
-                        { name: 'color', layout: { positions: { lg: { colSpan: 6, order: 4 } } } },
-                        { name: 'icon', layout: { positions: { lg: { colSpan: 6, order: 5 } } } },
+                        { name: 'calendarTypeId', layout: { positions: { lg: { colSpan: 6, order: 3 } } }, dataPath: 'calendarType.title' },
+                        { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 4 } } } },
+                        // Inheritance
+                        { name: 'parentId', layout: { positions: { lg: { colSpan: 12, order: 5 } } } },
+                        // Week Config
+                        { name: 'weekends', layout: { positions: { lg: { colSpan: 12, order: 8 } } } },
+                        { name: 'firstDayOfWeek', layout: { positions: { lg: { colSpan: 12, order: 9 } } } },
+                        // Working Hours
+                        //{ name: 'workingHours', layout: { positions: { lg: { colSpan: 12, order: 9 } } } },
                         // Settings
-                        { name: 'isActive', layout: { positions: { lg: { colSpan: 4, order: 6 } } } },
-                        { name: 'isDefault', layout: { positions: { lg: { colSpan: 4, order: 7 } } } },
-                        { name: 'order', layout: { positions: { lg: { colSpan: 4, order: 8 } } } },
+                        { name: 'isActive', layout: { positions: { lg: { colSpan: 4, order: 10 } } } },
+                        { name: 'isTemplate', layout: { positions: { lg: { colSpan: 4, order: 11 } } } },
+                        { name: 'order', layout: { positions: { lg: { colSpan: 4, order: 12 } } } },
                     ],
                     actions: [
-                        {
-                            title: '@general:actions.delete.title',
-                            command: 'delete-entity',
-                            priority: 'secondary',
-                            type: 'delete',
-                            scope: AXPEntityCommandScope.Individual,
-                        },
+                        entityMasterDeleteAction()
                     ],
                 },
                 list: {
                     actions: [
-                        {
-                            title: '@general:actions.create.title',
-                            command: 'create-entity',
-                            priority: 'primary',
-                            type: 'create',
-                            scope: AXPEntityCommandScope.TypeLevel,
-                        },
-                        {
-                            title: '@general:actions.delete-items.title',
-                            command: 'delete-entity',
-                            priority: 'primary',
-                            type: 'delete',
-                            scope: AXPEntityCommandScope.Selected,
-                        },
-                        {
-                            title: '@general:actions.detail.title',
-                            command: 'open-entity',
-                            priority: 'secondary',
-                            type: 'view',
-                            scope: AXPEntityCommandScope.Individual,
-                        },
-                        {
-                            title: '@general:actions.delete.title',
-                            command: 'delete-entity',
-                            priority: 'secondary',
-                            type: 'delete',
-                            scope: AXPEntityCommandScope.Individual,
-                        },
+                        ...entityMasterCrudActions()
                     ],
                     views: [
                         createAllQueryView({
-                            sorts: [{ name: 'order', dir: 'asc' }]
+                            sorts: [{ name: 'title', dir: 'asc' }]
                         }),
                     ],
                 },
             },
         },
-        //#endregion
+        //#endregion    
     };
     return entityDef;
 }
 
-var calendarEventType_entity = /*#__PURE__*/Object.freeze({
+var calendar_entity = /*#__PURE__*/Object.freeze({
     __proto__: null,
-    calendarEventTypeFactory: calendarEventTypeFactory
+    calendarFactory: calendarFactory
 });
 
+class AXMCalendarManagementService {
+    constructor() {
+        this.calendarEventService = inject(AXMCalendarEventService);
+        this.calendarEventTypeService = inject(AXMCalendarEventTypeService);
+    }
+    async getEvents(range) {
+        const events = await this.calendarEventService.query({
+            skip: 0,
+            take: 9999,
+            filter: {
+                logic: 'and',
+                filters: [
+                    { field: 'date', operator: { type: 'lte' }, value: range.end },
+                    { field: 'date', operator: { type: 'gte' }, value: range.from },
+                ],
+            },
+        });
+        return events.items.map((event) => ({
+            date: event.date,
+            title: event.title,
+            description: event.description,
+            type: {
+                color: event.type?.color,
+                icon: event.type?.icon,
+                isHoliday: event.type?.isHoliday,
+            },
+        }));
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.3", ngImport: i0, type: AXMCalendarManagementService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.3", ngImport: i0, type: AXMCalendarManagementService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.3", ngImport: i0, type: AXMCalendarManagementService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }] });
+
 // Main Module
 
 /**
  * Generated bundle index. Do not edit.
  */
 
-export { AXMCalendarEventService, AXMCalendarEventServiceImpl, AXMCalendarEventTypeService, AXMCalendarEventTypeServiceImpl, AXMCalendarManagementEntityProvider, AXMCalendarManagementMenuProvider, AXMCalendarManagementModule, AXMCalendarManagementPermissionDefinitionProvider, AXMCalendarManagementSearchCommandProvider, AXMCalendarService, AXMCalendarServiceImpl, RootConfig, calendarEventFactory, calendarEventTypeFactory, calendarFactory };
+export { AXMCalendarEventService, AXMCalendarEventServiceImpl, AXMCalendarEventTypeService, AXMCalendarEventTypeServiceImpl, AXMCalendarManagementEntityProvider, AXMCalendarManagementMenuProvider, AXMCalendarManagementModule, AXMCalendarManagementPermissionDefinitionProvider, AXMCalendarManagementSearchCommandProvider, AXMCalendarManagementService, AXMCalendarService, AXMCalendarServiceImpl, RootConfig, calendarEventFactory, calendarEventTypeFactory, calendarFactory };
 //# sourceMappingURL=acorex-modules-calendar-management.mjs.map