npm - @acorex/modules - Versions diffs - 21.0.0-next.39 → 21.0.0-next.40 - Mend

@acorex/modules 21.0.0-next.39 → 21.0.0-next.40

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (346) hide show

package/fesm2022/{acorex-modules-asset-management-asset.entity-BEjXfkPD.mjs → acorex-modules-asset-management-asset.entity-BaET-kSd.mjs} RENAMED Viewed

@@ -1,9 +1,10 @@
 import { RootConfig as RootConfig$1 } from '@acorex/modules/assessment-management';
+import { AXPWidgetsList } from '@acorex/modules/common';
 import { RootConfig as RootConfig$2 } from '@acorex/modules/maintenance-management';
 import { createAllQueryView } from '@acorex/platform/common';
 import { entityMasterCrudActions, entityMasterRecordActions, entityDetailsCrudActions, entityDetailsSimpleCondition } from '@acorex/platform/layout/entity';
 import { AXPWidgetsCatalog } from '@acorex/platform/layout/widget-core';
-import { R as RootConfig, A as ASSET_TYPE_COMPONENTS_PAGE_COMPONENT_KEY } from './acorex-modules-asset-management-acorex-modules-asset-management-F7Ok5dhs.mjs';
+import { R as RootConfig, A as ASSET_TYPE_COMPONENTS_PAGE_COMPONENT_KEY } from './acorex-modules-asset-management-acorex-modules-asset-management-BRap9yt6.mjs';
 //#region ----   Imports   ----
 //#endregion
@@ -17,16 +18,21 @@ async function factory(injector) {
         plugins: [
             { name: 'history' },
             { name: 'compare' },
+            { name: 'identifier', options: { field: 'code', rule: 'asset-code' } },
             { name: 'unique-fields', options: { fields: 'code', scope: 'global' } },
             {
                 name: 'meta-data-form',
                 options: {
                     path: 'assetTypeId',
                     title: '@asset-management:assets.entities.asset.components.meta-data-form.title',
-                    //options: { display: 'page' },
-                    order: 3,
+                    display: {
+                        section: {
+                            order: 50,
+                        },
+                    },
                 },
             },
+            ///// old
             {
                 name: 'status',
                 options: {
@@ -36,8 +42,8 @@ async function factory(injector) {
                 },
             },
             { name: 'tags' },
-            { name: 'documents', options: { order: 5 } },
-            { name: 'comments', options: { display: 'page', order: 6 } },
+            { name: 'documents', options: { order: 50 } },
+            { name: 'comments', options: { display: 'page', order: 60 } },
         ],
         relatedEntities: [
             {
@@ -45,8 +51,36 @@ async function factory(injector) {
                 title: '@maintenance-management:failure-registers.entities.failure-register.plural',
                 icon: RootConfig$2.entities.failureRegister.icon,
                 conditions: [entityDetailsSimpleCondition('assetId')],
+                excludeProperties: ['assetId'],
                 actions: [...entityDetailsCrudActions('assetId')],
-                layout: { type: 'page-list', position: 'after', order: 1 },
+                layout: { type: 'page-list', position: 'after', order: 10 },
+            },
+            {
+                entity: `${RootConfig.module.name}.${RootConfig.entities.assetRentalHistory.name}`,
+                title: RootConfig.entities.assetRentalHistory.titlePlural,
+                icon: RootConfig.entities.assetRentalHistory.icon,
+                hidden: `{{ !context.eval("id") || ![true, "true", 1, "1"].includes(context.eval("isRented")) }}`,
+                conditions: [entityDetailsSimpleCondition('assetId')],
+                actions: [...entityDetailsCrudActions('assetId')],
+                layout: { type: 'page-list', position: 'after', order: 20 },
+            },
+            {
+                entity: `${RootConfig$2.module.name}.${RootConfig$2.entities.maintenancePlan.name}`,
+                title: '@asset-management:assets.entities.asset.related-entities.maintenance-plans.title',
+                icon: RootConfig$2.entities.maintenancePlan.icon,
+                conditions: [entityDetailsSimpleCondition('assetId')],
+                excludeProperties: ['assetId'],
+                actions: [...entityDetailsCrudActions('assetId')],
+                layout: { type: 'page-list', position: 'after', order: 22 },
+            },
+            {
+                entity: `${RootConfig$2.module.name}.${RootConfig$2.entities.workOrder.name}`,
+                title: '@asset-management:assets.entities.asset.related-entities.work-orders.title',
+                icon: RootConfig$2.entities.workOrder.icon,
+                conditions: [entityDetailsSimpleCondition('assetId')],
+                excludeProperties: ['assetId'],
+                actions: [...entityDetailsCrudActions('assetId')],
+                layout: { type: 'page-list', position: 'after', order: 24 },
             },
         ],
         pages: [
@@ -80,10 +114,11 @@ async function factory(injector) {
         groups: [
             { id: 'basic-info', title: '@asset-management:assets.entities.asset.groups.basic-info' },
             { id: 'qr-code', title: '@asset-management:assets.entities.asset.fields.qr-code.title' },
-            // { id: 'category-info', title: '@asset-management:assets.entities.asset.groups.category-info' },
+            { id: 'description-info', title: '@asset-management:assets.entities.asset.groups.description-info' },
             { id: 'ownership', title: '@asset-management:assets.entities.asset.groups.ownership' },
             { id: 'placement', title: '@asset-management:assets.entities.asset.groups.placement' },
-            // { id: 'lifecycle', title: '@asset-management:assets.entities.asset.groups.lifecycle' },
+            { id: 'purchase', title: '@asset-management:assets.entities.asset.groups.purchase' },
+            { id: 'lifecycle-status', title: '@asset-management:assets.entities.asset.groups.lifecycle-status' },
             { id: 'booking', title: '@asset-management:assets.entities.asset.groups.booking' },
             { id: 'rental', title: '@asset-management:assets.entities.asset.groups.rental' },
             { id: 'media', title: '@asset-management:assets.entities.asset.groups.media' },
@@ -98,32 +133,14 @@ async function factory(injector) {
                 name: 'code',
                 title: '@asset-management:assets.entities.asset.fields.code.title',
                 groupId: 'basic-info',
-                schema: {
-                    dataType: 'number',
-                    unique: { enabled: true },
-                    interface: {
-                        type: AXPWidgetsCatalog.number,
-                        options: {
-                            placeholder: '@asset-management:assets.entities.asset.fields.code.placeholder',
-                        },
-                    },
-                },
-                options: {
-                    sort: { enabled: true },
-                    filter: { advance: { enabled: true }, inline: { enabled: true } },
-                },
-                validations: [{ rule: 'required' }],
-            },
-            {
-                name: 'title',
-                title: '@asset-management:assets.entities.asset.fields.title.title',
-                groupId: 'basic-info',
                 schema: {
                     dataType: 'string',
+                    unique: { enabled: true },
                     interface: {
                         type: AXPWidgetsCatalog.text,
                         options: {
-                            placeholder: '@asset-management:assets.entities.asset.fields.title.placeholder',
+                            disabled: true,
+                            placeholder: '@asset-management:assets.entities.asset.fields.code.placeholder',
                         },
                     },
                 },
@@ -150,6 +167,7 @@ async function factory(injector) {
                             valueField: 'id',
                             expose: [
                                 { source: 'id', target: 'assetType.id' },
+                                { source: 'code', target: 'assetType.code' },
                                 { source: 'title', target: 'assetType.title' },
                                 { source: 'categoryIds', target: 'assetType.categoryIds' },
                                 // { source: 'hasMaintenance', target: 'assetType.hasMaintenance' },
@@ -198,6 +216,25 @@ async function factory(injector) {
                     },
                 },
             },
+            {
+                name: 'title',
+                title: '@asset-management:assets.entities.asset.fields.title.title',
+                groupId: 'basic-info',
+                schema: {
+                    dataType: 'string',
+                    interface: {
+                        type: AXPWidgetsCatalog.text,
+                        options: {
+                            placeholder: '@asset-management:assets.entities.asset.fields.title.placeholder',
+                        },
+                    },
+                },
+                options: {
+                    sort: { enabled: true },
+                    filter: { advance: { enabled: true }, inline: { enabled: true } },
+                },
+                validations: [{ rule: 'required' }],
+            },
             {
                 name: 'qrCode',
                 title: '@asset-management:assets.entities.asset.fields.qr-code.title',
@@ -208,7 +245,7 @@ async function factory(injector) {
                         type: AXPWidgetsCatalog.qrcode,
                         options: {
                             size: 200,
-                            outputType: 'svg',
+                            outputType: 'canvas',
                             readonly: true,
                         },
                         triggers: [
@@ -223,7 +260,7 @@ async function factory(injector) {
             {
                 name: 'description',
                 title: '@asset-management:assets.entities.asset.fields.description.title',
-                groupId: 'basic-info',
+                groupId: 'description-info',
                 schema: {
                     dataType: 'string',
                     interface: {
@@ -348,24 +385,73 @@ async function factory(injector) {
             //     },
             //   },
             // },
-            // {
-            //   name: 'purchaseDate',
-            //   title: '@asset-management:assets.entities.asset.fields.purchase-date.title',
-            //   groupId: 'lifecycle',
-            //   schema: {
-            //     dataType: 'date',
-            //     interface: {
-            //       type: AXPWidgetsCatalog.dateTime,
-            //       options: {
-            //         format: 'date',
-            //       },
-            //     },
-            //   },
-            //   options: {
-            //     sort: { enabled: true },
-            //     filter: { advance: { enabled: true }, inline: { enabled: true } },
-            //   },
-            // },
+            {
+                name: 'purchaseDate',
+                title: '@asset-management:assets.entities.asset.fields.purchase-date.title',
+                groupId: 'purchase',
+                schema: {
+                    dataType: 'date',
+                    interface: {
+                        type: AXPWidgetsCatalog.dateTime,
+                        options: {
+                            format: 'date',
+                        },
+                    },
+                },
+                options: {
+                    sort: { enabled: true },
+                    filter: { advance: { enabled: true }, inline: { enabled: true } },
+                },
+            },
+            {
+                name: 'lifecycleStateId',
+                title: '@asset-management:assets.entities.asset.fields.lifecycle-state.title',
+                groupId: 'lifecycle-status',
+                schema: {
+                    dataType: 'string',
+                    defaultValue: 'draft',
+                    interface: {
+                        type: AXPWidgetsList.Advanced.Status,
+                        options: {
+                            definitionKey: 'asset-management.status.asset-lifecycle',
+                            entityName: `${RootConfig.module.name}.${RootConfig.entities.asset.name}`,
+                            statusField: 'lifecycleStateId',
+                        },
+                        triggers: [
+                            {
+                                event: "{{ events.context('lifecycleStateId') }}",
+                                action: '{{ assetManagement.clampOperationalStatusToLifecycle(context) }}',
+                            },
+                        ],
+                    },
+                },
+                options: {
+                    sort: { enabled: true },
+                    filter: { advance: { enabled: true }, inline: { enabled: true } },
+                },
+            },
+            {
+                name: 'assetStatusId',
+                title: '@asset-management:assets.entities.asset.fields.status.title',
+                groupId: 'lifecycle-status',
+                schema: {
+                    dataType: 'string',
+                    defaultValue: 'unavailable',
+                    interface: {
+                        type: AXPWidgetsCatalog.select,
+                        options: {
+                            valueField: 'id',
+                            textField: 'title',
+                            allowSearch: true,
+                            dataSource: '{{ assetManagement.operationalStatusSelectDataSource(context) }}',
+                        },
+                    },
+                },
+                options: {
+                    sort: { enabled: true },
+                    filter: { advance: { enabled: true }, inline: { enabled: true } },
+                },
+            },
             // {
             //   name: 'commissionedDate',
             //   title: '@asset-management:assets.entities.asset.fields.commissioned-date.title',
@@ -419,7 +505,7 @@ async function factory(injector) {
                 groupId: 'booking',
                 schema: {
                     dataType: 'string',
-                    visible: `{{ context.eval('isBookable') }}`,
+                    visible: `{{ !!context.eval('isBookable') }}`,
                     interface: {
                         type: AXPWidgetsCatalog.lookup,
                         options: {
@@ -440,7 +526,7 @@ async function factory(injector) {
                 groupId: 'booking',
                 schema: {
                     dataType: 'string',
-                    visible: `{{ context.eval('isBookable') }}`,
+                    visible: `{{ !!context.eval('isBookable') }}`,
                     interface: {
                         type: AXPWidgetsCatalog.lookup,
                         options: {
@@ -466,88 +552,6 @@ async function factory(injector) {
                     },
                 },
             },
-            {
-                name: 'rentedToId',
-                title: '@asset-management:assets.entities.asset.fields.rented-to-id.title',
-                groupId: 'rental',
-                schema: {
-                    dataType: 'string',
-                    visible: `{{ context.eval('isRented') }}`,
-                    interface: {
-                        type: AXPWidgetsCatalog.lookup,
-                        options: {
-                            entity: 'HumanCapitalManagement.Employee',
-                            textField: 'person.fullName',
-                            valueField: 'id',
-                            look: 'select',
-                            expose: [
-                                { source: 'id', target: 'rentedTo.id' },
-                                { source: 'person.fullName', target: 'rentedTo.displayName' },
-                            ],
-                        },
-                    },
-                },
-            },
-            {
-                name: 'rentedTo',
-                title: '@asset-management:assets.entities.asset.fields.rented-to.title',
-                groupId: 'rental',
-                schema: {
-                    dataType: 'object',
-                    visible: false,
-                    readonly: true,
-                },
-            },
-            {
-                name: 'rentalStartDate',
-                title: '@asset-management:assets.entities.asset.fields.rental-start-date.title',
-                groupId: 'rental',
-                schema: {
-                    dataType: 'date',
-                    visible: `{{ context.eval('isRented') }}`,
-                    interface: {
-                        type: AXPWidgetsCatalog.dateTime,
-                        options: {
-                            format: 'date',
-                        },
-                    },
-                },
-            },
-            {
-                name: 'rentalReturnDate',
-                title: '@asset-management:assets.entities.asset.fields.rental-return-date.title',
-                groupId: 'rental',
-                schema: {
-                    dataType: 'date',
-                    visible: `{{ context.eval('isRented') }}`,
-                    interface: {
-                        type: AXPWidgetsCatalog.dateTime,
-                        options: {
-                            format: 'date',
-                        },
-                    },
-                },
-            },
-            {
-                name: 'rentalStatus',
-                title: '@asset-management:assets.entities.asset.fields.rental-status.title',
-                groupId: 'rental',
-                schema: {
-                    dataType: 'string',
-                    visible: `{{ context.eval('isRented') }}`,
-                    interface: {
-                        type: AXPWidgetsCatalog.select,
-                        options: {
-                            valueField: 'id',
-                            dataSource: [
-                                { id: 'active', title: 'Active' },
-                                { id: 'returned', title: 'Returned' },
-                                { id: 'overdue', title: 'Overdue' },
-                            ],
-                        },
-                    },
-                },
-            },
             {
                 name: 'images',
                 title: '@asset-management:assets.entities.asset.fields.images.title',
@@ -611,16 +615,15 @@ async function factory(injector) {
             { name: 'title', options: { order: 2 } },
             { name: 'assetTypeId', options: { dataPath: 'assetType.title', order: 3 } },
             { name: 'serialNumber', options: { order: 4 } },
-            { name: 'description', options: { order: 5 } },
-            { name: 'ownerId', options: { dataPath: 'owner.displayName', order: 6 } },
-            { name: 'assignedToEmployeeId', options: { dataPath: 'assignedToEmployee.displayName', order: 7 } },
-            { name: 'locationId', options: { dataPath: 'location.title', order: 8 } },
-            // { name: 'statusId' },
-            // { name: 'purchaseDate' },
-            // { name: 'commissionedDate' },
-            // { name: 'retiredDate' },
-            { name: 'isBookable', options: { order: 9 } },
-            { name: 'qrCode', options: { order: 4 } },
+            { name: 'qrCode', options: { order: 5 } },
+            { name: 'description', options: { order: 6 } },
+            { name: 'ownerId', options: { dataPath: 'owner.displayName', order: 7 } },
+            { name: 'assignedToEmployeeId', options: { dataPath: 'assignedToEmployee.displayName', order: 8 } },
+            { name: 'locationId', options: { dataPath: 'location.title', order: 9 } },
+            { name: 'purchaseDate', options: { order: 10 } },
+            { name: 'lifecycleStateId', options: { dataPath: 'lifecycleState.title', order: 11 } },
+            { name: 'assetStatusId', options: { dataPath: 'assetStatus.title', order: 12 } },
+            { name: 'isBookable', options: { order: 13 } },
         ],
         queries: {},
         interfaces: {
@@ -628,40 +631,38 @@ async function factory(injector) {
                 create: {
                     sections: [
                         { id: 'basic-info', order: 1, layout: { positions: { lg: { colSpan: 8, colStart: 1 } } } },
-                        { id: 'qr-code', order: 2, layout: { positions: { lg: { colSpan: 4, colStart: 9 } } } },
-                        // { id: 'category-info', order: 2 },
-                        { id: 'ownership', order: 4 },
-                        { id: 'placement', order: 5 },
-                        { id: 'lifecycle', order: 6 },
+                        { id: 'qr-code', order: 2, layout: { positions: { lg: { colSpan: 4, colStart: 9, rowSpan: 2 } } } },
+                        { id: 'description-info', order: 3, layout: { positions: { lg: { colSpan: 12, colStart: 13 } } } },
+                        { id: 'ownership', order: 3 },
+                        { id: 'placement', order: 4 },
+                        { id: 'purchase', order: 5, layout: { positions: { lg: { colStart: 1 } } } },
+                        { id: 'lifecycle-status', order: 6 },
                         { id: 'booking', order: 7 },
                         { id: 'rental', order: 8 },
                         { id: 'media', order: 9 },
                     ],
                     properties: [
                         { name: 'code', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
-                        { name: 'title', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
-                        { name: 'assetTypeId', layout: { positions: { lg: { colSpan: 6, order: 3 } } } },
-                        { name: 'serialNumber', layout: { positions: { lg: { colSpan: 6, order: 4 } } } },
-                        { name: 'testTagIdentificationNumber', layout: { positions: { lg: { colSpan: 6, order: 5 } } } },
-                        // { name: 'hasMaintenance', layout: { positions: { lg: { colSpan: 6, order: 6 } } } },
+                        { name: 'assetTypeId', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
+                        { name: 'serialNumber', layout: { positions: { lg: { colSpan: 6, order: 3 } } } },
+                        { name: 'testTagIdentificationNumber', layout: { positions: { lg: { colSpan: 6, order: 4 } } } },
+                        { name: 'title', layout: { positions: { lg: { colSpan: 12, order: 5 } } } },
+                        { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 6 } } } },
                         { name: 'isRented', layout: { positions: { lg: { colSpan: 12, order: 7 } } } },
-                        { name: 'rentedToId', layout: { positions: { lg: { colSpan: 3, order: 8 } } } },
-                        { name: 'rentalStartDate', layout: { positions: { lg: { colSpan: 3, order: 9 } } } },
-                        { name: 'rentalReturnDate', layout: { positions: { lg: { colSpan: 3, order: 10 } } } },
-                        { name: 'rentalStatus', layout: { positions: { lg: { colSpan: 3, order: 11 } } } },
                         { name: 'ownerId', layout: { positions: { lg: { colSpan: 6, order: 12 } } } },
                         { name: 'assignedToEmployeeId', layout: { positions: { lg: { colSpan: 6, order: 13 } } } },
-                        // { name: 'parentId', layout: { positions: { lg: { colSpan: 6, order: 10 } } } },
                         { name: 'locationId', layout: { positions: { lg: { colSpan: 6, order: 14 } } } },
-                        // { name: 'purchaseDate', layout: { positions: { lg: { colSpan: 6, order: 11 } } } },
+                        { name: 'purchaseDate', layout: { positions: { lg: { colSpan: 6, order: 15, colStart: 1 } } } },
+                        { name: 'lifecycleStateId', layout: { positions: { lg: { colSpan: 6, order: 16, colStart: 1 } } } },
+                        { name: 'assetStatusId', layout: { positions: { lg: { colSpan: 6, order: 17, colStart: 1 } } } },
                         // { name: 'commissionedDate', layout: { positions: { lg: { colSpan: 6, order: 12 } } } },
                         // { name: 'retiredDate', layout: { positions: { lg: { colSpan: 6, order: 13 } } } },
-                        { name: 'isBookable', layout: { positions: { lg: { colSpan: 12, order: 16 } } } },
-                        { name: 'preBookQuestionnaireId', layout: { positions: { lg: { colSpan: 6, order: 17 } } } },
-                        { name: 'postBookQuestionnaireId', layout: { positions: { lg: { colSpan: 6, order: 18 } } } },
+                        { name: 'isBookable', layout: { positions: { lg: { colSpan: 12, order: 18 } } } },
+                        { name: 'preBookQuestionnaireId', layout: { positions: { lg: { colSpan: 6, order: 19 } } } },
+                        { name: 'postBookQuestionnaireId', layout: { positions: { lg: { colSpan: 6, order: 20 } } } },
                         {
                             name: 'qrCode',
-                            layout: { label: { visible: false }, positions: { lg: { colSpan: 12, order: 0 } } },
+                            layout: { label: { visible: false }, positions: { lg: { colSpan: 12 } } },
                         },
                         { name: 'images', layout: { positions: { lg: { colSpan: 12, order: 20 } } } },
                     ],
@@ -670,38 +671,38 @@ async function factory(injector) {
                     sections: [
                         { id: 'basic-info', order: 1, layout: { positions: { lg: { colSpan: 8, colStart: 1 } } } },
                         { id: 'qr-code', order: 2, layout: { positions: { lg: { colSpan: 4, colStart: 9 } } } },
-                        // { id: 'category-info', order: 2 },
-                        { id: 'ownership', order: 4 },
-                        { id: 'placement', order: 5 },
-                        { id: 'booking', order: 6 },
-                        { id: 'rental', order: 7 },
-                        { id: 'media', order: 8 },
+                        { id: 'description-info', order: 3, layout: { positions: { lg: { colSpan: 12, colStart: 13 } } } },
+                        { id: 'ownership', order: 3 },
+                        { id: 'placement', order: 4 },
+                        { id: 'purchase', order: 5 },
+                        { id: 'lifecycle-status', order: 6 },
+                        { id: 'booking', order: 7 },
+                        { id: 'rental', order: 8 },
+                        { id: 'media', order: 9 },
                     ],
                     properties: [
                         { name: 'code', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
-                        { name: 'title', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
-                        { name: 'assetTypeId', layout: { positions: { lg: { colSpan: 6, order: 3 } } } },
-                        { name: 'serialNumber', layout: { positions: { lg: { colSpan: 6, order: 4 } } } },
-                        { name: 'testTagIdentificationNumber', layout: { positions: { lg: { colSpan: 6, order: 5 } } } },
-                        // { name: 'hasMaintenance', layout: { positions: { lg: { colSpan: 6, order: 6 } } } },
+                        { name: 'assetTypeId', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
+                        { name: 'serialNumber', layout: { positions: { lg: { colSpan: 6, order: 3 } } } },
+                        { name: 'testTagIdentificationNumber', layout: { positions: { lg: { colSpan: 6, order: 4 } } } },
+                        { name: 'title', layout: { positions: { lg: { colSpan: 12, order: 5 } } } },
+                        { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 6 } } } },
                         { name: 'isRented', layout: { positions: { lg: { colSpan: 12, order: 7 } } } },
-                        { name: 'rentedToId', layout: { positions: { lg: { colSpan: 3, order: 8 } } } },
-                        { name: 'rentalStartDate', layout: { positions: { lg: { colSpan: 3, order: 9 } } } },
-                        { name: 'rentalReturnDate', layout: { positions: { lg: { colSpan: 3, order: 10 } } } },
-                        { name: 'rentalStatus', layout: { positions: { lg: { colSpan: 3, order: 11 } } } },
                         { name: 'ownerId', layout: { positions: { lg: { colSpan: 6, order: 12 } } } },
                         { name: 'assignedToEmployeeId', layout: { positions: { lg: { colSpan: 6, order: 13 } } } },
                         // { name: 'parentId', layout: { positions: { lg: { colSpan: 6, order: 10 } } } },
                         { name: 'locationId', layout: { positions: { lg: { colSpan: 6, order: 14 } } } },
-                        // { name: 'purchaseDate', layout: { positions: { lg: { colSpan: 6, order: 11 } } } },
+                        { name: 'purchaseDate', layout: { positions: { lg: { colSpan: 6, order: 11 } } } },
+                        { name: 'lifecycleStateId', layout: { positions: { lg: { colSpan: 6, order: 16, colStart: 1 } } } },
+                        { name: 'assetStatusId', layout: { positions: { lg: { colSpan: 6, order: 17, colStart: 1 } } } },
                         // { name: 'commissionedDate', layout: { positions: { lg: { colSpan: 6, order: 12 } } } },
                         // { name: 'retiredDate', layout: { positions: { lg: { colSpan: 6, order: 13 } } } },
-                        { name: 'isBookable', layout: { positions: { lg: { colSpan: 12, order: 16 } } } },
-                        { name: 'preBookQuestionnaireId', layout: { positions: { lg: { colSpan: 6, order: 17 } } } },
-                        { name: 'postBookQuestionnaireId', layout: { positions: { lg: { colSpan: 6, order: 18 } } } },
+                        { name: 'isBookable', layout: { positions: { lg: { colSpan: 12, order: 18 } } } },
+                        { name: 'preBookQuestionnaireId', layout: { positions: { lg: { colSpan: 6, order: 19 } } } },
+                        { name: 'postBookQuestionnaireId', layout: { positions: { lg: { colSpan: 6, order: 20 } } } },
                         {
                             name: 'qrCode',
-                            layout: { label: { visible: false }, positions: { lg: { colSpan: 12, order: 0 } } },
+                            layout: { label: { visible: false }, positions: { lg: { colSpan: 12 } } },
                         },
                         { name: 'images', layout: { positions: { lg: { colSpan: 12, order: 20 } } } },
                     ],
@@ -711,38 +712,39 @@ async function factory(injector) {
                     sections: [
                         { id: 'basic-info', order: 1, layout: { positions: { lg: { colSpan: 8, colStart: 1 } } } },
                         { id: 'qr-code', order: 2, layout: { positions: { lg: { colSpan: 4, colStart: 9 } } } },
+                        { id: 'description-info', order: 3, layout: { positions: { lg: { colSpan: 12, colStart: 13 } } } },
                         { id: 'ownership', order: 3 },
                         { id: 'placement', order: 4 },
-                        { id: 'lifecycle', order: 5 },
-                        { id: 'booking', order: 6 },
-                        { id: 'rental', order: 7 },
-                        { id: 'media', order: 8 },
+                        { id: 'purchase', order: 5 },
+                        { id: 'lifecycle-status', order: 6 },
+                        { id: 'booking', order: 7 },
+                        { id: 'rental', order: 8 },
+                        { id: 'media', order: 9 },
                     ],
                     properties: [
                         { name: 'code', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
-                        { name: 'title', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
-                        { name: 'assetTypeId', layout: { positions: { lg: { colSpan: 6, order: 3 } } } },
-                        { name: 'serialNumber', layout: { positions: { lg: { colSpan: 6, order: 4 } } } },
-                        { name: 'testTagIdentificationNumber', layout: { positions: { lg: { colSpan: 6, order: 5 } } } },
+                        { name: 'assetTypeId', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
+                        { name: 'serialNumber', layout: { positions: { lg: { colSpan: 6, order: 3 } } } },
+                        { name: 'testTagIdentificationNumber', layout: { positions: { lg: { colSpan: 6, order: 4 } } } },
+                        { name: 'title', layout: { positions: { lg: { colSpan: 12, order: 5 } } } },
+                        { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 6 } } } },
                         // { name: 'hasMaintenance', layout: { positions: { lg: { colSpan: 6, order: 6 } } } },
                         { name: 'isRented', layout: { positions: { lg: { colSpan: 12, order: 7 } } } },
-                        { name: 'rentedToId', layout: { positions: { lg: { colSpan: 3, order: 8 } } } },
-                        { name: 'rentalStartDate', layout: { positions: { lg: { colSpan: 3, order: 9 } } } },
-                        { name: 'rentalReturnDate', layout: { positions: { lg: { colSpan: 3, order: 10 } } } },
-                        { name: 'rentalStatus', layout: { positions: { lg: { colSpan: 3, order: 11 } } } },
                         { name: 'ownerId', layout: { positions: { lg: { colSpan: 6, order: 12 } } } },
                         { name: 'assignedToEmployeeId', layout: { positions: { lg: { colSpan: 6, order: 13 } } } },
                         // { name: 'parentId', layout: { positions: { lg: { colSpan: 6, order: 10 } } } },
                         { name: 'locationId', layout: { positions: { lg: { colSpan: 6, order: 14 } } } },
-                        // { name: 'purchaseDate', layout: { positions: { lg: { colSpan: 4, order: 11 } } } },
+                        { name: 'purchaseDate', layout: { positions: { lg: { colSpan: 6, order: 15 } } } },
+                        { name: 'lifecycleStateId', layout: { positions: { lg: { colSpan: 6, order: 16, colStart: 1 } } } },
+                        { name: 'assetStatusId', layout: { positions: { lg: { colSpan: 6, order: 17, colStart: 1 } } } },
                         // { name: 'commissionedDate', layout: { positions: { lg: { colSpan: 4, order: 12 } } } },
                         // { name: 'retiredDate', layout: { positions: { lg: { colSpan: 4, order: 13 } } } },
-                        { name: 'isBookable', layout: { positions: { lg: { colSpan: 12, order: 16 } } } },
-                        { name: 'preBookQuestionnaireId', layout: { positions: { lg: { colSpan: 6, order: 17 } } } },
-                        { name: 'postBookQuestionnaireId', layout: { positions: { lg: { colSpan: 6, order: 18 } } } },
+                        { name: 'isBookable', layout: { positions: { lg: { colSpan: 12, order: 18 } } } },
+                        { name: 'preBookQuestionnaireId', layout: { positions: { lg: { colSpan: 6, order: 19 } } } },
+                        { name: 'postBookQuestionnaireId', layout: { positions: { lg: { colSpan: 6, order: 20 } } } },
                         {
                             name: 'qrCode',
-                            layout: { label: { visible: false }, positions: { lg: { colSpan: 12, order: 0 } } },
+                            layout: { label: { visible: false }, positions: { lg: { colSpan: 12 } } },
                         },
                         { name: 'images', layout: { positions: { lg: { colSpan: 12, order: 20 } } } },
                     ],
@@ -759,4 +761,4 @@ async function factory(injector) {
 }
 export { factory };
-//# sourceMappingURL=acorex-modules-asset-management-asset.entity-BEjXfkPD.mjs.map
+//# sourceMappingURL=acorex-modules-asset-management-asset.entity-BaET-kSd.mjs.map