@acorex/modules 21.0.0-next.88 → 21.0.0-next.90

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

@@ -3,9 +3,11 @@ import { AXP_PERMISSION_DEFINITION_PROVIDER } from '@acorex/platform/auth';
 import { AXPSearchCommandProvider, AXP_MENU_PROVIDER, AXP_SEARCH_PROVIDER, AXP_STATUS_PROVIDERS } from '@acorex/platform/common';
 import { AXP_MODULE_MANIFEST_PROVIDER, provideLazyProvider } from '@acorex/platform/core';
 import { AXPEntityService, AXP_ENTITY_DEFINITION_LOADER } from '@acorex/platform/layout/entity';
+import { createSelectProperty, AXPWidgetGroupEnum, AXP_WIDGETS_EDITOR_CATEGORY, AXPWidgetCoreModule, AXP_WIDGET_DEFINITION_PROVIDER } from '@acorex/platform/layout/widget-core';
 import * as i0 from '@angular/core';
 import { Injectable, inject, NgModule } from '@angular/core';
 import { AXPCommonMenuKeys } from '@acorex/modules/common';
+import { AXP_NAME_PROPERTY, AXP_DATA_PATH_PROPERTY, AXP_READONLY_PROPERTY, AXP_BEHAVIOR_PROPERTY_GROUP } from '@acorex/platform/layout/widgets';
 import { AXPWidgetsList } from '@acorex/platform/contracts';
 import { createAllQueryView, entityMasterCrudActions, entityMasterRecordActions, entityDetailsCrudActions, entityDetailsSimpleCondition } from '@acorex/platform/layout/entity-contracts';
 
@@ -112,6 +114,13 @@ const AXMWorkplaceSafetyManagementPermissionKeys = {
             Update: 'WorkplaceSafetyManagement:Permission:HazardRisk.Update',
             Delete: 'WorkplaceSafetyManagement:Permission:HazardRisk.Delete',
         },
+        HazardRiskPpeRule: {
+            Management: 'WorkplaceSafetyManagement:Permission:HazardRiskPpeRule.Management',
+            View: 'WorkplaceSafetyManagement:Permission:HazardRiskPpeRule.View',
+            Create: 'WorkplaceSafetyManagement:Permission:HazardRiskPpeRule.Create',
+            Update: 'WorkplaceSafetyManagement:Permission:HazardRiskPpeRule.Update',
+            Delete: 'WorkplaceSafetyManagement:Permission:HazardRiskPpeRule.Delete',
+        },
         ControlHierarchyLevels: {
             Management: 'WorkplaceSafetyManagement:Permission:ControlHierarchyLevels.Management',
         },
@@ -180,6 +189,13 @@ const RootConfig = {
             titlePlural: `@${config.i18n}:hazard-risks.entities.hazard-risk.plural`,
             icon: 'fa-light fa-shield-exclamation',
         },
+        hazardRiskPpeRule: {
+            name: 'HazardRiskPpeRule',
+            source: `${config.module}.HazardRiskPpeRule`,
+            title: `@${config.i18n}:hazard-risk-ppe-rules.entities.hazard-risk-ppe-rule.title`,
+            titlePlural: `@${config.i18n}:hazard-risk-ppe-rules.entities.hazard-risk-ppe-rule.plural`,
+            icon: 'fa-light fa-user-helmet-safety',
+        },
         controlHierarchyLevels: {
             name: 'ControlHierarchyLevels',
             source: `${config.module}.ControlHierarchyLevels`,
@@ -247,21 +263,23 @@ class AXMWorkplaceSafetyManagementEntityProvider {
         }
         switch (entityName) {
             case RootConfig.entities.hazard.name:
-                return (await Promise.resolve().then(function () { return index$5; })).hazardEntityFactory();
+                return (await Promise.resolve().then(function () { return index$6; })).hazardEntityFactory();
             case RootConfig.entities.hazardRegister.name:
-                return (await Promise.resolve().then(function () { return index$3; })).hazardRegisterEntityFactory();
+                return (await Promise.resolve().then(function () { return index$4; })).hazardRegisterEntityFactory();
             case RootConfig.entities.riskRating.name:
                 return (await Promise.resolve().then(function () { return index; })).riskRatingEntityFactory();
             case RootConfig.entities.ppeItem.name:
                 return (await Promise.resolve().then(function () { return index$1; })).ppeItemEntityFactory();
             case RootConfig.entities.hazardPpeRule.name:
-                return (await Promise.resolve().then(function () { return index$4; })).hazardPpeRuleEntityFactory();
+                return (await Promise.resolve().then(function () { return index$5; })).hazardPpeRuleEntityFactory();
             case RootConfig.entities.hazardRisk.name:
-                return (await Promise.resolve().then(function () { return index$2; })).hazardRiskEntityFactory();
+                return (await Promise.resolve().then(function () { return index$3; })).hazardRiskEntityFactory();
+            case RootConfig.entities.hazardRiskPpeRule.name:
+                return (await Promise.resolve().then(function () { return index$2; })).hazardRiskPpeRuleEntityFactory();
             case RootConfig.entities.controlHierarchyLevels.name:
-                return (await Promise.resolve().then(function () { return index$7; })).controlHierarchyLevelsEntityFactory();
+                return (await Promise.resolve().then(function () { return index$8; })).controlHierarchyLevelsEntityFactory();
             case RootConfig.entities.controlMeasure.name:
-                return (await Promise.resolve().then(function () { return index$6; })).controlMeasureEntityFactory();
+                return (await Promise.resolve().then(function () { return index$7; })).controlMeasureEntityFactory();
             default:
                 return null;
         }
@@ -357,6 +375,7 @@ class AXMWorkplaceSafetyManagementPermissionDefinitionProvider {
         const PPE_ITEM_PERMISSIONS = '@workplacesafety-management:ppe-items.permissions.ppe-item';
         const HAZARD_PPE_RULE_PERMISSIONS = '@workplacesafety-management:hazard-ppe-rules.permissions.hazard-ppe-rule';
         const HAZARD_RISK_PERMISSIONS = '@workplacesafety-management:hazard-risks.permissions.hazard-risk';
+        const HAZARD_RISK_PPE_RULE_PERMISSIONS = '@workplacesafety-management:hazard-risk-ppe-rules.permissions.hazard-risk-ppe-rule';
         const CONTROL_MEASURE_TYPE_PERMISSIONS = '@workplacesafety-management:control-measure-types.permissions.control-measure-type';
         const CONTROL_MEASURE_PERMISSIONS = '@workplacesafety-management:control-measures.permissions.control-measure';
         context
@@ -393,6 +412,12 @@ class AXMWorkplaceSafetyManagementPermissionDefinitionProvider {
             .addChild(keys.HazardRisk.Update, `${HAZARD_RISK_PERMISSIONS}.update.title`, `${HAZARD_RISK_PERMISSIONS}.update.description`)
             .addChild(keys.HazardRisk.Delete, `${HAZARD_RISK_PERMISSIONS}.delete.title`, `${HAZARD_RISK_PERMISSIONS}.delete.description`)
             .endPermission()
+            .addPermission(keys.HazardRiskPpeRule.Management, `${HAZARD_RISK_PPE_RULE_PERMISSIONS}.management.title`, `${HAZARD_RISK_PPE_RULE_PERMISSIONS}.management.description`)
+            .addChild(keys.HazardRiskPpeRule.View, `${HAZARD_RISK_PPE_RULE_PERMISSIONS}.view.title`, `${HAZARD_RISK_PPE_RULE_PERMISSIONS}.view.description`)
+            .addChild(keys.HazardRiskPpeRule.Create, `${HAZARD_RISK_PPE_RULE_PERMISSIONS}.create.title`, `${HAZARD_RISK_PPE_RULE_PERMISSIONS}.create.description`)
+            .addChild(keys.HazardRiskPpeRule.Update, `${HAZARD_RISK_PPE_RULE_PERMISSIONS}.update.title`, `${HAZARD_RISK_PPE_RULE_PERMISSIONS}.update.description`)
+            .addChild(keys.HazardRiskPpeRule.Delete, `${HAZARD_RISK_PPE_RULE_PERMISSIONS}.delete.title`, `${HAZARD_RISK_PPE_RULE_PERMISSIONS}.delete.description`)
+            .endPermission()
             .addPermission(keys.ControlHierarchyLevels.Management, `${CONTROL_MEASURE_TYPE_PERMISSIONS}.management.title`, `${CONTROL_MEASURE_TYPE_PERMISSIONS}.management.description`)
             .endPermission()
             .addPermission(keys.ControlMeasure.Management, `${CONTROL_MEASURE_PERMISSIONS}.management.title`, `${CONTROL_MEASURE_PERMISSIONS}.management.description`)
@@ -413,6 +438,73 @@ class AXMWorkplaceSafetyManagementSearchCommandProvider extends AXPSearchCommand
     }
 }
 
+//#region ----   Imports   ----
+//#endregion
+//#region ----   Widget Config   ----
+const AXMControlHierarchyDiagramWidget = {
+    name: 'control-hierarchy-diagram-editor',
+    title: '@workplacesafety-management:control-measure-types.components.control-hierarchy-diagram.widget-title',
+    description: '@workplacesafety-management:control-measure-types.components.control-hierarchy-diagram.widget-description',
+    icon: 'fa-light fa-layer-group',
+    categories: AXP_WIDGETS_EDITOR_CATEGORY,
+    groups: [AXPWidgetGroupEnum.UtilityWidget],
+    type: 'editor',
+    options: {
+        needLabel: false,
+    },
+    properties: [
+        AXP_NAME_PROPERTY,
+        AXP_DATA_PATH_PROPERTY,
+        createSelectProperty({
+            name: 'viewType',
+            title: '@workplacesafety-management:control-measure-types.components.control-hierarchy-diagram.fields.view-type.title',
+            group: AXP_BEHAVIOR_PROPERTY_GROUP,
+            path: 'options.viewType',
+            defaultValue: { id: 'horizontal', title: 'Horizontal cards' },
+            dataSource: [
+                {
+                    id: 'horizontal',
+                    title: '@workplacesafety-management:control-measure-types.components.control-hierarchy-diagram.view-types.horizontal',
+                },
+                {
+                    id: 'vertical',
+                    title: '@workplacesafety-management:control-measure-types.components.control-hierarchy-diagram.view-types.vertical',
+                },
+                {
+                    id: 'horizontal-chevron',
+                    title: '@workplacesafety-management:control-measure-types.components.control-hierarchy-diagram.view-types.horizontal-chevron',
+                },
+            ],
+        }),
+        AXP_READONLY_PROPERTY,
+    ],
+    components: {
+        view: {
+            component: () => import('./acorex-modules-workplacesafety-management-control-hierarchy-diagram-widget-view.component-DwC2aHVt.mjs').then((c) => c.AXMControlHierarchyDiagramWidgetViewComponent),
+        },
+        edit: {
+            component: () => import('./acorex-modules-workplacesafety-management-control-hierarchy-diagram-widget-edit.component-CFF7X1MO.mjs').then((c) => c.AXMControlHierarchyDiagramWidgetEditComponent),
+        },
+        designer: {
+            component: () => import('./acorex-modules-workplacesafety-management-control-hierarchy-diagram-widget-edit.component-CFF7X1MO.mjs').then((c) => c.AXMControlHierarchyDiagramWidgetEditComponent),
+        },
+    },
+};
+//#endregion
+
+//#endregion
+//#region ----   Widget Provider   ----
+class AXMWorkplaceSafetyManagementWidgetsProvider {
+    getWidgets() {
+        return [AXMControlHierarchyDiagramWidget];
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXMWorkplaceSafetyManagementWidgetsProvider, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXMWorkplaceSafetyManagementWidgetsProvider }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXMWorkplaceSafetyManagementWidgetsProvider, decorators: [{
+            type: Injectable
+        }] });
+
 const AXM_HAZARD_CODE_IDENTIFIER_RULE = {
     id: 'hazard-code',
     title: 'Hazard Code',
@@ -471,7 +563,7 @@ const AXM_PPE_ITEM_CODE_IDENTIFIER_RULE = {
 
 class AXMWorkplaceSafetyManagementModule {
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXMWorkplaceSafetyManagementModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
-    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "21.2.9", ngImport: i0, type: AXMWorkplaceSafetyManagementModule }); }
+    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "21.2.9", ngImport: i0, type: AXMWorkplaceSafetyManagementModule, imports: [AXPWidgetCoreModule] }); }
     static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXMWorkplaceSafetyManagementModule, providers: [
             {
                 provide: AXP_IDENTIFIER_RULES,
@@ -527,14 +619,20 @@ class AXMWorkplaceSafetyManagementModule {
             provideLazyProvider(AXP_STATUS_PROVIDERS, () => import('./acorex-modules-workplacesafety-management-ppe-item-status.provider-Bx2yqUVH.mjs').then((m) => m.AXMWorkplaceSafetyManagementPpeItemStatusProvider)),
             provideLazyProvider(AXP_STATUS_PROVIDERS, () => import('./acorex-modules-workplacesafety-management-hazard-ppe-rule-status.provider-CsJpSfdA.mjs').then((m) => m.AXMWorkplaceSafetyManagementHazardPpeRuleStatusProvider)),
             provideLazyProvider(AXP_STATUS_PROVIDERS, () => import('./acorex-modules-workplacesafety-management-hazard-risk-status.provider-CdzRLBqN.mjs').then((m) => m.AXMWorkplaceSafetyManagementHazardRiskStatusProvider)),
+            provideLazyProvider(AXP_STATUS_PROVIDERS, () => import('./acorex-modules-workplacesafety-management-hazard-risk-ppe-rule-status.provider-BsRNRZ6z.mjs').then((m) => m.AXMWorkplaceSafetyManagementHazardRiskPpeRuleStatusProvider)),
             provideLazyProvider(AXP_STATUS_PROVIDERS, () => import('./acorex-modules-workplacesafety-management-control-hierarchy-levels-status.provider-D6x3LSI7.mjs').then((m) => m.AXMWorkplaceSafetyManagementControlHierarchyLevelsStatusProvider)),
             provideLazyProvider(AXP_STATUS_PROVIDERS, () => import('./acorex-modules-workplacesafety-management-control-measure-status.provider-BINkFgat.mjs').then((m) => m.AXMWorkplaceSafetyManagementControlMeasureStatusProvider)),
-        ] }); }
+            {
+                provide: AXP_WIDGET_DEFINITION_PROVIDER,
+                useClass: AXMWorkplaceSafetyManagementWidgetsProvider,
+                multi: true,
+            },
+        ], imports: [AXPWidgetCoreModule] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXMWorkplaceSafetyManagementModule, decorators: [{
             type: NgModule,
             args: [{
-                    imports: [],
+                    imports: [AXPWidgetCoreModule],
                     providers: [
                         {
                             provide: AXP_IDENTIFIER_RULES,
@@ -590,8 +688,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
                         provideLazyProvider(AXP_STATUS_PROVIDERS, () => import('./acorex-modules-workplacesafety-management-ppe-item-status.provider-Bx2yqUVH.mjs').then((m) => m.AXMWorkplaceSafetyManagementPpeItemStatusProvider)),
                         provideLazyProvider(AXP_STATUS_PROVIDERS, () => import('./acorex-modules-workplacesafety-management-hazard-ppe-rule-status.provider-CsJpSfdA.mjs').then((m) => m.AXMWorkplaceSafetyManagementHazardPpeRuleStatusProvider)),
                         provideLazyProvider(AXP_STATUS_PROVIDERS, () => import('./acorex-modules-workplacesafety-management-hazard-risk-status.provider-CdzRLBqN.mjs').then((m) => m.AXMWorkplaceSafetyManagementHazardRiskStatusProvider)),
+                        provideLazyProvider(AXP_STATUS_PROVIDERS, () => import('./acorex-modules-workplacesafety-management-hazard-risk-ppe-rule-status.provider-BsRNRZ6z.mjs').then((m) => m.AXMWorkplaceSafetyManagementHazardRiskPpeRuleStatusProvider)),
                         provideLazyProvider(AXP_STATUS_PROVIDERS, () => import('./acorex-modules-workplacesafety-management-control-hierarchy-levels-status.provider-D6x3LSI7.mjs').then((m) => m.AXMWorkplaceSafetyManagementControlHierarchyLevelsStatusProvider)),
                         provideLazyProvider(AXP_STATUS_PROVIDERS, () => import('./acorex-modules-workplacesafety-management-control-measure-status.provider-BINkFgat.mjs').then((m) => m.AXMWorkplaceSafetyManagementControlMeasureStatusProvider)),
+                        {
+                            provide: AXP_WIDGET_DEFINITION_PROVIDER,
+                            useClass: AXMWorkplaceSafetyManagementWidgetsProvider,
+                            multi: true,
+                        },
                     ],
                 }]
         }] });
@@ -599,10 +703,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
 //#region ----   Imports   ----
 //#endregion
 //#region ----   Constants   ----
-const listSortAndFilterOptions$7 = {
+const listSortAndFilterOptions$8 = {
     sort: { enabled: true },
     filter: { advance: { enabled: true }, inline: { enabled: true } },
 };
+const hierarchyDiagramPropertyLayout = {
+    name: 'hierarchyDiagram',
+    layout: { positions: { lg: { colSpan: 12, order: 0 } } },
+};
 //#endregion
 //#region ----   Entity factory   ----
 async function controlHierarchyLevelsEntityFactory() {
@@ -635,14 +743,43 @@ async function controlHierarchyLevelsEntityFactory() {
                     mode: 'free',
                 },
             },
+            {
+                name: 'category',
+                options: {
+                    appearance: { icon: true, color: true },
+                },
+            },
         ],
         groups: [
+            {
+                id: 'visualization',
+                title: '@workplacesafety-management:control-measure-types.entities.control-measure-type.groups.visualization',
+            },
             {
                 id: 'basic-info',
                 title: '@workplacesafety-management:control-measure-types.entities.control-measure-type.groups.basic-info',
             },
         ],
         properties: [
+            {
+                name: 'hierarchyDiagram',
+                title: '@workplacesafety-management:control-measure-types.components.control-hierarchy-diagram.title',
+                groupId: 'visualization',
+                schema: {
+                    dataType: 'object',
+                    nullable: true,
+                    readonly: true,
+                    interface: {
+                        type: AXPWidgetsList.Editors.ControlHierarchyDiagram,
+                        options: {
+                            readonly: true,
+                            showLabel: false,
+                            showTitle: false,
+                            showViewTypeSelector: true,
+                        },
+                    },
+                },
+            },
             {
                 name: 'id',
                 title: '@general:terms.common.id',
@@ -653,7 +790,7 @@ async function controlHierarchyLevelsEntityFactory() {
                 name: 'code',
                 title: '@workplacesafety-management:control-measure-types.entities.control-measure-type.fields.code.title',
                 groupId: 'basic-info',
-                options: listSortAndFilterOptions$7,
+                options: listSortAndFilterOptions$8,
                 schema: {
                     dataType: 'string',
                     unique: { enabled: true },
@@ -670,7 +807,7 @@ async function controlHierarchyLevelsEntityFactory() {
                 name: 'title',
                 title: '@workplacesafety-management:control-measure-types.entities.control-measure-type.fields.title.title',
                 groupId: 'basic-info',
-                options: listSortAndFilterOptions$7,
+                options: listSortAndFilterOptions$8,
                 schema: {
                     dataType: 'string',
                     interface: {
@@ -686,7 +823,7 @@ async function controlHierarchyLevelsEntityFactory() {
                 name: 'effectivenessLevel',
                 title: '@workplacesafety-management:control-measure-types.entities.control-measure-type.fields.effectiveness-level.title',
                 groupId: 'basic-info',
-                options: listSortAndFilterOptions$7,
+                options: listSortAndFilterOptions$8,
                 schema: {
                     dataType: 'number',
                     interface: {
@@ -729,8 +866,9 @@ async function controlHierarchyLevelsEntityFactory() {
         interfaces: {
             master: {
                 create: {
-                    sections: [{ id: 'basic-info' }],
+                    sections: [{ id: 'visualization' }, { id: 'basic-info' }],
                     properties: [
+                        hierarchyDiagramPropertyLayout,
                         { name: 'code', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
                         { name: 'title', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
                         { name: 'effectivenessLevel', layout: { positions: { lg: { colSpan: 6, order: 3 } } } },
@@ -738,8 +876,9 @@ async function controlHierarchyLevelsEntityFactory() {
                     ],
                 },
                 update: {
-                    sections: [{ id: 'basic-info' }],
+                    sections: [{ id: 'visualization' }, { id: 'basic-info' }],
                     properties: [
+                        hierarchyDiagramPropertyLayout,
                         { name: 'code', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
                         { name: 'title', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
                         { name: 'effectivenessLevel', layout: { positions: { lg: { colSpan: 6, order: 3 } } } },
@@ -748,8 +887,9 @@ async function controlHierarchyLevelsEntityFactory() {
                 },
                 single: {
                     title: '{{ title }}',
-                    sections: [{ id: 'basic-info', layout: { positions: { lg: { colSpan: 12 } } } }],
+                    sections: [{ id: 'visualization' }, { id: 'basic-info', layout: { positions: { lg: { colSpan: 12 } } } }],
                     properties: [
+                        hierarchyDiagramPropertyLayout,
                         { name: 'code', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
                         { name: 'title', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
                         { name: 'effectivenessLevel', layout: { positions: { lg: { colSpan: 6, order: 3 } } } },
@@ -775,7 +915,7 @@ async function controlHierarchyLevelsEntityFactory() {
 //#region ----   Imports   ----
 //#endregion
 
-var index$7 = /*#__PURE__*/Object.freeze({
+var index$8 = /*#__PURE__*/Object.freeze({
     __proto__: null,
     controlHierarchyLevelsEntityFactory: controlHierarchyLevelsEntityFactory
 });
@@ -783,7 +923,7 @@ var index$7 = /*#__PURE__*/Object.freeze({
 //#region ----   Imports   ----
 //#endregion
 //#region ----   Constants   ----
-const listSortAndFilterOptions$6 = {
+const listSortAndFilterOptions$7 = {
     sort: { enabled: true },
     filter: { advance: { enabled: true }, inline: { enabled: true } },
 };
@@ -842,7 +982,7 @@ async function controlMeasureEntityFactory() {
                 name: 'code',
                 title: '@workplacesafety-management:control-measures.entities.control-measure.fields.code.title',
                 groupId: 'basic-info',
-                options: listSortAndFilterOptions$6,
+                options: listSortAndFilterOptions$7,
                 schema: {
                     dataType: 'string',
                     unique: { enabled: true },
@@ -859,7 +999,7 @@ async function controlMeasureEntityFactory() {
                 name: 'title',
                 title: '@workplacesafety-management:control-measures.entities.control-measure.fields.title.title',
                 groupId: 'basic-info',
-                options: listSortAndFilterOptions$6,
+                options: listSortAndFilterOptions$7,
                 schema: {
                     dataType: 'string',
                     interface: {
@@ -901,16 +1041,16 @@ async function controlMeasureEntityFactory() {
                 create: {
                     sections: [{ id: 'basic-info' }, { id: 'instruction' }],
                     properties: [
-                        { name: 'code', layout: { positions: { lg: { colSpan: 4, order: 1 } } } },
-                        { name: 'title', layout: { positions: { lg: { colSpan: 8, order: 2 } } } },
+                        { name: 'code', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
+                        { name: 'title', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
                         { name: 'instruction', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
                     ],
                 },
                 update: {
                     sections: [{ id: 'basic-info' }, { id: 'instruction' }],
                     properties: [
-                        { name: 'code', layout: { positions: { lg: { colSpan: 4, order: 1 } } } },
-                        { name: 'title', layout: { positions: { lg: { colSpan: 8, order: 2 } } } },
+                        { name: 'code', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
+                        { name: 'title', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
                         { name: 'instruction', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
                     ],
                 },
@@ -921,8 +1061,8 @@ async function controlMeasureEntityFactory() {
                         { id: 'instruction', layout: { positions: { lg: { colSpan: 12 } } } },
                     ],
                     properties: [
-                        { name: 'code', layout: { positions: { lg: { colSpan: 4, order: 1 } } } },
-                        { name: 'title', layout: { positions: { lg: { colSpan: 8, order: 2 } } } },
+                        { name: 'code', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
+                        { name: 'title', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
                         { name: 'instruction', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
                     ],
                     actions: [...entityMasterRecordActions()],
@@ -941,17 +1081,38 @@ async function controlMeasureEntityFactory() {
 //#region ----   Imports   ----
 //#endregion
 
-var index$6 = /*#__PURE__*/Object.freeze({
+var index$7 = /*#__PURE__*/Object.freeze({
     __proto__: null,
     controlMeasureEntityFactory: controlMeasureEntityFactory
 });
 
 //#endregion
 //#region ----   Constants   ----
-const listSortAndFilterOptions$5 = {
+const listSortAndFilterOptions$6 = {
     sort: { enabled: true },
     filter: { advance: { enabled: true }, inline: { enabled: true } },
 };
+const CONTROL_MEASURE_REPEATER_CHILDREN$1 = [
+    {
+        type: AXPWidgetsList.Editors.LookupBox,
+        mode: 'edit',
+        path: 'controlMeasureId',
+        name: 'controlMeasureId',
+        options: {
+            entity: `${RootConfig.module.name}.${RootConfig.entities.controlMeasure.name}`,
+            look: 'select',
+            allowSearch: true,
+            textField: 'title',
+            valueField: 'id',
+            columns: ['code', 'title'],
+            expose: [
+                { source: 'id', target: 'controlMeasure.id' },
+                { source: 'title', target: 'controlMeasure.title' },
+                { source: 'code', target: 'controlMeasure.code' },
+            ],
+        },
+    },
+];
 //#endregion
 //#region ----   Entity Factory   ----
 async function hazardEntityFactory() {
@@ -1003,10 +1164,10 @@ async function hazardEntityFactory() {
                 columns: [
                     { name: 'code' },
                     { name: 'title' },
+                    { name: 'description' },
                     { name: 'riskMatrixId' },
                     { name: 'defaultInitialRiskRatingId' },
                     { name: 'defaultResidualRiskRatingId' },
-                    { name: 'sortOrder' },
                 ],
                 actions: [...entityDetailsCrudActions('hazardId')],
                 layout: { type: 'page-list', position: 'after', order: 11 },
@@ -1021,7 +1182,7 @@ async function hazardEntityFactory() {
                     { name: 'code' },
                     { name: 'ppeItemId' },
                     { name: 'requirementType' },
-                    { name: 'riskRatingIdWithPpe' },
+                    { name: 'usageInstruction' },
                     { name: 'sortOrder' },
                 ],
                 actions: [...entityDetailsCrudActions('hazardId')],
@@ -1037,6 +1198,14 @@ async function hazardEntityFactory() {
                 id: 'assessment-compliance',
                 title: '@workplacesafety-management:hazards.entities.hazard.groups.assessment-compliance',
             },
+            {
+                id: 'control-measures',
+                title: '@workplacesafety-management:hazards.entities.hazard.groups.control-measures',
+            },
+            {
+                id: 'chemical-compliance',
+                title: '@workplacesafety-management:hazards.entities.hazard.groups.chemical-compliance',
+            },
         ],
         properties: [
             {
@@ -1049,7 +1218,7 @@ async function hazardEntityFactory() {
                 name: 'code',
                 title: '@workplacesafety-management:hazards.entities.hazard.fields.code.title',
                 groupId: 'basic-info',
-                options: listSortAndFilterOptions$5,
+                options: listSortAndFilterOptions$6,
                 schema: {
                     dataType: 'string',
                     unique: { enabled: true },
@@ -1067,7 +1236,7 @@ async function hazardEntityFactory() {
                 name: 'title',
                 title: '@workplacesafety-management:hazards.entities.hazard.fields.title.title',
                 groupId: 'basic-info',
-                options: listSortAndFilterOptions$5,
+                options: listSortAndFilterOptions$6,
                 schema: {
                     dataType: 'string',
                     interface: {
@@ -1102,7 +1271,7 @@ async function hazardEntityFactory() {
                 name: 'templateId',
                 title: '@workplacesafety-management:hazards.entities.hazard.fields.template-id.title',
                 groupId: 'assessment-compliance',
-                options: listSortAndFilterOptions$5,
+                options: listSortAndFilterOptions$6,
                 schema: {
                     dataType: 'string',
                     nullable: true,
@@ -1122,7 +1291,7 @@ async function hazardEntityFactory() {
             {
                 name: 'safetyDataSheetAvailable',
                 title: '@workplacesafety-management:hazards.entities.hazard.fields.safety-data-sheet-available.title',
-                groupId: 'assessment-compliance',
+                groupId: 'chemical-compliance',
                 options: {
                     sort: { enabled: true },
                     filter: { advance: { enabled: true }, inline: { enabled: true } },
@@ -1138,7 +1307,7 @@ async function hazardEntityFactory() {
             {
                 name: 'ghsIds',
                 title: '@workplacesafety-management:hazards.entities.hazard.fields.ghs-ids.title',
-                groupId: 'assessment-compliance',
+                groupId: 'chemical-compliance',
                 options: {
                     sort: { enabled: false },
                     filter: { advance: { enabled: false }, inline: { enabled: false } },
@@ -1161,6 +1330,21 @@ async function hazardEntityFactory() {
                     },
                 },
             },
+            {
+                name: 'controlMeasureIds',
+                title: '',
+                groupId: 'control-measures',
+                schema: {
+                    defaultValue: [],
+                    dataType: 'array',
+                    nullable: true,
+                    interface: {
+                        type: AXPWidgetsList.Layouts.RepeaterLayout,
+                        options: { hasControls: true, allowReorder: true },
+                        children: [...CONTROL_MEASURE_REPEATER_CHILDREN$1],
+                    },
+                },
+            },
         ],
         columns: [
             { name: 'code', options: { width: '140px', order: 1 } },
@@ -1171,25 +1355,37 @@ async function hazardEntityFactory() {
         interfaces: {
             master: {
                 create: {
-                    sections: [{ id: 'basic-info' }, { id: 'assessment-compliance' }],
+                    sections: [
+                        { id: 'basic-info' },
+                        { id: 'chemical-compliance' },
+                        { id: 'assessment-compliance' },
+                        { id: 'control-measures' },
+                    ],
                     properties: [
                         { name: 'code', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
                         { name: 'title', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
                         { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 3 } } } },
+                        { name: 'templateId', layout: { label: { visible: false }, positions: { lg: { colSpan: 12, order: 1 } } } },
                         { name: 'safetyDataSheetAvailable', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
                         { name: 'ghsIds', layout: { positions: { lg: { colSpan: 12, order: 2 } } } },
-                        { name: 'templateId', layout: { label: { visible: false }, positions: { lg: { colSpan: 12, order: 3 } } } },
+                        { name: 'controlMeasureIds', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
                     ],
                 },
                 update: {
-                    sections: [{ id: 'basic-info' }, { id: 'assessment-compliance' }],
+                    sections: [
+                        { id: 'basic-info' },
+                        { id: 'chemical-compliance' },
+                        { id: 'assessment-compliance' },
+                        { id: 'control-measures' },
+                    ],
                     properties: [
                         { name: 'code', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
                         { name: 'title', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
                         { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 3 } } } },
+                        { name: 'templateId', layout: { label: { visible: false }, positions: { lg: { colSpan: 12, order: 1 } } } },
                         { name: 'safetyDataSheetAvailable', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
                         { name: 'ghsIds', layout: { positions: { lg: { colSpan: 12, order: 2 } } } },
-                        { name: 'templateId', layout: { label: { visible: false }, positions: { lg: { colSpan: 12, order: 3 } } } },
+                        { name: 'controlMeasureIds', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
                     ],
                 },
                 single: {
@@ -1197,14 +1393,17 @@ async function hazardEntityFactory() {
                     sections: [
                         { id: 'basic-info', layout: { positions: { lg: { colSpan: 12 } } } },
                         { id: 'assessment-compliance', layout: { positions: { lg: { colSpan: 12 } } } },
+                        { id: 'chemical-compliance', layout: { positions: { lg: { colSpan: 12 } } } },
+                        { id: 'control-measures', layout: { positions: { lg: { colSpan: 12 } } } },
                     ],
                     properties: [
                         { name: 'code', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
                         { name: 'title', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
                         { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 3 } } } },
+                        { name: 'templateId', layout: { label: { visible: false }, positions: { lg: { colSpan: 12, order: 1 } } } },
                         { name: 'safetyDataSheetAvailable', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
                         { name: 'ghsIds', layout: { positions: { lg: { colSpan: 12, order: 2 } } } },
-                        { name: 'templateId', layout: { label: { visible: false }, positions: { lg: { colSpan: 12, order: 3 } } } },
+                        { name: 'controlMeasureIds', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
                     ],
                     actions: [...entityMasterRecordActions()],
                 },
@@ -1219,14 +1418,14 @@ async function hazardEntityFactory() {
 }
 //#endregion
 
-var index$5 = /*#__PURE__*/Object.freeze({
+var index$6 = /*#__PURE__*/Object.freeze({
     __proto__: null,
     hazardEntityFactory: hazardEntityFactory
 });
 
 //#endregion
 //#region ----   Constants   ----
-const listSortAndFilterOptions$4 = {
+const listSortAndFilterOptions$5 = {
     sort: { enabled: true },
     filter: { advance: { enabled: true }, inline: { enabled: true } },
 };
@@ -1264,8 +1463,8 @@ async function hazardPpeRuleEntityFactory() {
                 title: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.groups.basic-info',
             },
             {
-                id: 'requirements',
-                title: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.groups.requirements',
+                id: 'configuration',
+                title: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.groups.configuration',
             },
             {
                 id: 'notes',
@@ -1283,7 +1482,7 @@ async function hazardPpeRuleEntityFactory() {
                 name: 'code',
                 title: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.fields.code.title',
                 groupId: 'basic-info',
-                options: listSortAndFilterOptions$4,
+                options: listSortAndFilterOptions$5,
                 schema: {
                     dataType: 'string',
                     unique: { enabled: true },
@@ -1301,7 +1500,7 @@ async function hazardPpeRuleEntityFactory() {
                 name: 'hazardId',
                 title: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.fields.hazard-id.title',
                 groupId: 'basic-info',
-                options: listSortAndFilterOptions$4,
+                options: listSortAndFilterOptions$5,
                 schema: {
                     dataType: 'string',
                     interface: {
@@ -1326,7 +1525,7 @@ async function hazardPpeRuleEntityFactory() {
                 name: 'ppeItemId',
                 title: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.fields.ppe-item-id.title',
                 groupId: 'basic-info',
-                options: listSortAndFilterOptions$4,
+                options: listSortAndFilterOptions$5,
                 schema: {
                     dataType: 'string',
                     interface: {
@@ -1347,28 +1546,11 @@ async function hazardPpeRuleEntityFactory() {
                 },
                 validations: [{ rule: 'required' }],
             },
-            {
-                name: 'sortOrder',
-                title: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.fields.sort-order.title',
-                groupId: 'basic-info',
-                options: listSortAndFilterOptions$4,
-                schema: {
-                    dataType: 'number',
-                    nullable: true,
-                    interface: {
-                        type: AXPWidgetsList.Editors.NumberBox,
-                        options: {
-                            minValue: 0,
-                            placeholder: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.fields.sort-order.placeholder',
-                        },
-                    },
-                },
-            },
             {
                 name: 'requirementType',
                 title: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.fields.requirement-type.title',
-                groupId: 'requirements',
-                options: listSortAndFilterOptions$4,
+                groupId: 'configuration',
+                options: listSortAndFilterOptions$5,
                 schema: {
                     dataType: 'string',
                     interface: {
@@ -1383,27 +1565,18 @@ async function hazardPpeRuleEntityFactory() {
                 validations: [{ rule: 'required' }],
             },
             {
-                name: 'riskRatingIdWithPpe',
-                title: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.fields.risk-rating-id-with-ppe.title',
-                groupId: 'requirements',
-                options: listSortAndFilterOptions$4,
+                name: 'sortOrder',
+                title: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.fields.sort-order.title',
+                groupId: 'configuration',
+                options: listSortAndFilterOptions$5,
                 schema: {
-                    dataType: 'string',
+                    dataType: 'number',
                     nullable: true,
                     interface: {
-                        type: AXPWidgetsList.Editors.LookupBox,
+                        type: AXPWidgetsList.Editors.NumberBox,
                         options: {
-                            look: 'select',
-                            entity: `${RootConfig.module.name}.${RootConfig.entities.riskRating.name}`,
-                            textField: 'title',
-                            valueField: 'id',
-                            columns: ['code', 'title'],
-                            hasClearButton: true,
-                            expose: [
-                                { source: 'id', target: 'riskRatingWithPpe.id' },
-                                { source: 'title', target: 'riskRatingWithPpe.title' },
-                                { source: 'code', target: 'riskRatingWithPpe.code' },
-                            ],
+                            minValue: 0,
+                            placeholder: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.fields.sort-order.placeholder',
                         },
                     },
                 },
@@ -1453,33 +1626,30 @@ async function hazardPpeRuleEntityFactory() {
             { name: 'code', options: { width: '120px', order: 1 } },
             { name: 'ppeItemId', options: { dataPath: 'ppeItem.title', order: 2 } },
             { name: 'requirementType', options: { width: '140px', order: 3 } },
-            { name: 'riskRatingIdWithPpe', options: { dataPath: 'riskRatingWithPpe.title', order: 4 } },
-            { name: 'sortOrder', options: { width: '100px', order: 5 } },
+            { name: 'sortOrder', options: { width: '100px', order: 4 } },
         ],
         interfaces: {
             master: {
                 create: {
-                    sections: [{ id: 'basic-info' }, { id: 'requirements' }, { id: 'notes' }],
+                    sections: [{ id: 'basic-info' }, { id: 'configuration' }, { id: 'notes' }],
                     properties: [
-                        { name: 'code', layout: { positions: { lg: { colSpan: 4, order: 1 } } } },
-                        { name: 'sortOrder', layout: { positions: { lg: { colSpan: 4, order: 2 } } } },
-                        { name: 'hazardId', layout: { positions: { lg: { colSpan: 12, order: 3 } } } },
-                        { name: 'ppeItemId', layout: { positions: { lg: { colSpan: 12, order: 4 } } } },
+                        { name: 'code', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
+                        { name: 'hazardId', layout: { positions: { lg: { colSpan: 12, order: 2 } } } },
+                        { name: 'ppeItemId', layout: { positions: { lg: { colSpan: 12, order: 3 } } } },
                         { name: 'requirementType', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
-                        { name: 'riskRatingIdWithPpe', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
+                        { name: 'sortOrder', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
                         { name: 'conditionNote', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
                         { name: 'usageInstruction', layout: { positions: { lg: { colSpan: 12, order: 2 } } } },
                     ],
                 },
                 update: {
-                    sections: [{ id: 'basic-info' }, { id: 'requirements' }, { id: 'notes' }],
+                    sections: [{ id: 'basic-info' }, { id: 'configuration' }, { id: 'notes' }],
                     properties: [
-                        { name: 'code', layout: { positions: { lg: { colSpan: 4, order: 1 } } } },
-                        { name: 'sortOrder', layout: { positions: { lg: { colSpan: 4, order: 2 } } } },
-                        { name: 'hazardId', layout: { positions: { lg: { colSpan: 12, order: 3 } } } },
-                        { name: 'ppeItemId', layout: { positions: { lg: { colSpan: 12, order: 4 } } } },
+                        { name: 'code', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
+                        { name: 'hazardId', layout: { positions: { lg: { colSpan: 12, order: 2 } } } },
+                        { name: 'ppeItemId', layout: { positions: { lg: { colSpan: 12, order: 3 } } } },
                         { name: 'requirementType', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
-                        { name: 'riskRatingIdWithPpe', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
+                        { name: 'sortOrder', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
                         { name: 'conditionNote', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
                         { name: 'usageInstruction', layout: { positions: { lg: { colSpan: 12, order: 2 } } } },
                     ],
@@ -1488,16 +1658,15 @@ async function hazardPpeRuleEntityFactory() {
                     title: '{{ code }}',
                     sections: [
                         { id: 'basic-info', layout: { positions: { lg: { colSpan: 12 } } } },
-                        { id: 'requirements', layout: { positions: { lg: { colSpan: 12 } } } },
+                        { id: 'configuration', layout: { positions: { lg: { colSpan: 12 } } } },
                         { id: 'notes', layout: { positions: { lg: { colSpan: 12 } } } },
                     ],
                     properties: [
-                        { name: 'code', layout: { positions: { lg: { colSpan: 4, order: 1 } } } },
-                        { name: 'sortOrder', layout: { positions: { lg: { colSpan: 4, order: 2 } } } },
-                        { name: 'hazardId', layout: { positions: { lg: { colSpan: 12, order: 3 } } } },
-                        { name: 'ppeItemId', layout: { positions: { lg: { colSpan: 12, order: 4 } } } },
+                        { name: 'code', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
+                        { name: 'hazardId', layout: { positions: { lg: { colSpan: 12, order: 2 } } } },
+                        { name: 'ppeItemId', layout: { positions: { lg: { colSpan: 12, order: 3 } } } },
                         { name: 'requirementType', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
-                        { name: 'riskRatingIdWithPpe', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
+                        { name: 'sortOrder', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
                         { name: 'conditionNote', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
                         { name: 'usageInstruction', layout: { positions: { lg: { colSpan: 12, order: 2 } } } },
                     ],
@@ -1514,7 +1683,7 @@ async function hazardPpeRuleEntityFactory() {
 }
 //#endregion
 
-var index$4 = /*#__PURE__*/Object.freeze({
+var index$5 = /*#__PURE__*/Object.freeze({
     __proto__: null,
     hazardPpeRuleEntityFactory: hazardPpeRuleEntityFactory
 });
@@ -1533,7 +1702,7 @@ var AXMHazardRegisterContextType;
 
 //#endregion
 //#region ----   Constants   ----
-const listSortAndFilterOptions$3 = {
+const listSortAndFilterOptions$4 = {
     sort: { enabled: true },
     filter: { advance: { enabled: true }, inline: { enabled: true } },
 };
@@ -1610,7 +1779,7 @@ async function hazardRegisterEntityFactory() {
                 name: 'code',
                 title: '@workplacesafety-management:hazard-registers.entities.hazard-register.fields.code.title',
                 groupId: 'basic-info',
-                options: listSortAndFilterOptions$3,
+                options: listSortAndFilterOptions$4,
                 schema: {
                     dataType: 'string',
                     unique: { enabled: true },
@@ -1628,7 +1797,7 @@ async function hazardRegisterEntityFactory() {
                 name: 'title',
                 title: '@workplacesafety-management:hazard-registers.entities.hazard-register.fields.title.title',
                 groupId: 'basic-info',
-                options: listSortAndFilterOptions$3,
+                options: listSortAndFilterOptions$4,
                 schema: {
                     dataType: 'string',
                     interface: {
@@ -1664,7 +1833,7 @@ async function hazardRegisterEntityFactory() {
                 name: 'registerType',
                 title: '@workplacesafety-management:hazard-registers.entities.hazard-register.fields.register-type.title',
                 groupId: 'basic-info',
-                options: listSortAndFilterOptions$3,
+                options: listSortAndFilterOptions$4,
                 schema: {
                     dataType: 'string',
                     interface: {
@@ -1688,7 +1857,7 @@ async function hazardRegisterEntityFactory() {
                 name: 'hazardId',
                 title: '@workplacesafety-management:hazard-registers.entities.hazard-register.fields.hazard-id.title',
                 groupId: 'hazard-link',
-                options: listSortAndFilterOptions$3,
+                options: listSortAndFilterOptions$4,
                 schema: {
                     dataType: 'string',
                     interface: {
@@ -1713,7 +1882,7 @@ async function hazardRegisterEntityFactory() {
                 name: 'contextType',
                 title: '@workplacesafety-management:hazard-registers.entities.hazard-register.fields.context-type.title',
                 groupId: 'context',
-                options: listSortAndFilterOptions$3,
+                options: listSortAndFilterOptions$4,
                 schema: {
                     dataType: 'string',
                     interface: {
@@ -1730,7 +1899,7 @@ async function hazardRegisterEntityFactory() {
                 name: 'contextId',
                 title: '@workplacesafety-management:hazard-registers.entities.hazard-register.fields.context-id.title',
                 groupId: 'context',
-                options: listSortAndFilterOptions$3,
+                options: listSortAndFilterOptions$4,
                 schema: {
                     dataType: 'string',
                     interface: {
@@ -1792,7 +1961,7 @@ async function hazardRegisterEntityFactory() {
 }
 //#endregion
 
-var index$3 = /*#__PURE__*/Object.freeze({
+var index$4 = /*#__PURE__*/Object.freeze({
     __proto__: null,
     get AXMHazardRegisterContextType () { return AXMHazardRegisterContextType; },
     hazardRegisterEntityFactory: hazardRegisterEntityFactory
@@ -1801,14 +1970,58 @@ var index$3 = /*#__PURE__*/Object.freeze({
 //#region ----   Imports   ----
 //#endregion
 //#region ----   Constants   ----
-const listSortAndFilterOptions$2 = {
+const listSortAndFilterOptions$3 = {
     sort: { enabled: true },
     filter: { advance: { enabled: true }, inline: { enabled: true } },
 };
-const noteFieldOptions = {
+const noteFieldOptions$1 = {
     sort: { enabled: false },
     filter: { advance: { enabled: true }, inline: { enabled: false } },
 };
+const RISK_MATRIX_PREVIEW_COMMAND = `${RISK_MANAGEMENT_RISK_MATRIX_CELL_ENTITY}:Preview`;
+const RISK_MATRIX_LOOKUP_OPTIONS = {
+    look: 'select',
+    entity: RISK_MANAGEMENT_RISK_MATRIX_CELL_ENTITY,
+    textField: 'title',
+    valueField: 'id',
+    columns: ['code', 'title'],
+    filter: {
+        field: 'catalogScopeKeys',
+        operator: { type: 'contains' },
+        value: RISK_MANAGEMENT_HAZARD_CATALOG_SCOPE,
+    },
+    expose: [
+        { source: 'id', target: 'riskMatrix.id' },
+        { source: 'title', target: 'riskMatrix.title' },
+        { source: 'code', target: 'riskMatrix.code' },
+    ],
+};
+const RISK_MATRIX_PREVIEW_BUTTON_OPTIONS = {
+    text: '',
+    color: 'primary',
+    look: 'solid',
+    icon: 'fa-light fa-eye',
+    disabled: '{{ !context.eval("riskMatrixId") }}',
+    command: {
+        name: RISK_MATRIX_PREVIEW_COMMAND,
+        options: {
+            riskMatrixCellId: '{{ context.eval("riskMatrixId") }}',
+            title: '{{ context.eval("riskMatrix.title") }}',
+        },
+    },
+};
+const riskAssessmentPropertyLayout = (name) => {
+    const layouts = {
+        riskMatrixId: { order: 1, positions: { lg: { colSpan: 11, colStart: 1 } } },
+        riskMatrixPreview: {
+            order: 1,
+            positions: { lg: { colSpan: 1, colStart: 12 } },
+        },
+        defaultInitialRiskRatingId: { order: 2, positions: { lg: { colSpan: 6, colStart: 1 } } },
+        defaultResidualRiskRatingId: { order: 2, positions: { lg: { colSpan: 6, colStart: 7 } } },
+    };
+    return { name, layout: layouts[name] };
+};
 const CONTROL_MEASURE_REPEATER_CHILDREN = [
     {
         type: AXPWidgetsList.Editors.LookupBox,
@@ -1858,6 +2071,24 @@ async function hazardRiskEntityFactory() {
                 },
             },
         ],
+        relatedEntities: [
+            {
+                entity: `${RootConfig.module.name}.${RootConfig.entities.hazardRiskPpeRule.name}`,
+                title: RootConfig.entities.hazardRiskPpeRule.titlePlural,
+                icon: RootConfig.entities.hazardRiskPpeRule.icon,
+                conditions: [entityDetailsSimpleCondition('hazardRiskId')],
+                excludeProperties: ['hazardRiskId'],
+                columns: [
+                    { name: 'ppeItemId' },
+                    { name: 'requirementType' },
+                    { name: 'conditionNote' },
+                    { name: 'usageInstruction' },
+                ],
+                actions: [...entityDetailsCrudActions('hazardRiskId')],
+                appearOn: { create: true, update: true },
+                layout: { type: 'tab-list', order: 1 },
+            },
+        ],
         groups: [
             {
                 id: 'basic-info',
@@ -1871,14 +2102,6 @@ async function hazardRiskEntityFactory() {
                 id: 'control-measures',
                 title: '@workplacesafety-management:hazard-risks.entities.hazard-risk.groups.control-measures',
             },
-            {
-                id: 'compliance',
-                title: '@workplacesafety-management:hazard-risks.entities.hazard-risk.groups.compliance',
-            },
-            {
-                id: 'notes',
-                title: '@workplacesafety-management:hazard-risks.entities.hazard-risk.groups.notes',
-            },
         ],
         properties: [
             {
@@ -1891,7 +2114,7 @@ async function hazardRiskEntityFactory() {
                 name: 'code',
                 title: '@workplacesafety-management:hazard-risks.entities.hazard-risk.fields.code.title',
                 groupId: 'basic-info',
-                options: listSortAndFilterOptions$2,
+                options: listSortAndFilterOptions$3,
                 schema: {
                     dataType: 'string',
                     unique: { enabled: true },
@@ -1909,7 +2132,7 @@ async function hazardRiskEntityFactory() {
                 name: 'title',
                 title: '@workplacesafety-management:hazard-risks.entities.hazard-risk.fields.title.title',
                 groupId: 'basic-info',
-                options: listSortAndFilterOptions$2,
+                options: listSortAndFilterOptions$3,
                 schema: {
                     dataType: 'string',
                     interface: {
@@ -1925,7 +2148,7 @@ async function hazardRiskEntityFactory() {
                 name: 'description',
                 title: '@workplacesafety-management:hazard-risks.entities.hazard-risk.fields.description.title',
                 groupId: 'basic-info',
-                options: noteFieldOptions,
+                options: noteFieldOptions$1,
                 schema: {
                     dataType: 'string',
                     nullable: true,
@@ -1942,7 +2165,7 @@ async function hazardRiskEntityFactory() {
                 name: 'hazardId',
                 title: '@workplacesafety-management:hazard-risks.entities.hazard-risk.fields.hazard-id.title',
                 groupId: 'basic-info',
-                options: listSortAndFilterOptions$2,
+                options: listSortAndFilterOptions$3,
                 schema: {
                     dataType: 'string',
                     interface: {
@@ -1966,47 +2189,28 @@ async function hazardRiskEntityFactory() {
             {
                 name: 'riskMatrixId',
                 title: '@workplacesafety-management:hazard-risks.entities.hazard-risk.fields.risk-matrix-id.title',
-                groupId: 'basic-info',
-                options: listSortAndFilterOptions$2,
+                groupId: 'risk-assessment',
+                options: listSortAndFilterOptions$3,
                 schema: {
                     dataType: 'string',
                     interface: {
                         type: AXPWidgetsList.Editors.LookupBox,
-                        options: {
-                            look: 'select',
-                            entity: RISK_MANAGEMENT_RISK_MATRIX_CELL_ENTITY,
-                            textField: 'title',
-                            valueField: 'id',
-                            columns: ['code', 'title'],
-                            filter: {
-                                field: 'catalogScopeKeys',
-                                operator: { type: 'contains' },
-                                value: RISK_MANAGEMENT_HAZARD_CATALOG_SCOPE,
-                            },
-                            expose: [
-                                { source: 'id', target: 'riskMatrix.id' },
-                                { source: 'title', target: 'riskMatrix.title' },
-                                { source: 'code', target: 'riskMatrix.code' },
-                            ],
-                        },
+                        options: RISK_MATRIX_LOOKUP_OPTIONS,
                     },
                 },
                 validations: [{ rule: 'required' }],
             },
             {
-                name: 'sortOrder',
-                title: '@workplacesafety-management:hazard-risks.entities.hazard-risk.fields.sort-order.title',
-                groupId: 'basic-info',
-                options: listSortAndFilterOptions$2,
+                name: 'riskMatrixPreview',
+                title: '\u00a0',
+                groupId: 'risk-assessment',
                 schema: {
-                    dataType: 'number',
+                    dataType: 'string',
                     nullable: true,
                     interface: {
-                        type: AXPWidgetsList.Editors.NumberBox,
-                        options: {
-                            minValue: 0,
-                            placeholder: '@workplacesafety-management:hazard-risks.entities.hazard-risk.fields.sort-order.placeholder',
-                        },
+                        type: AXPWidgetsList.Actions.ActionButton,
+                        mode: 'edit',
+                        options: RISK_MATRIX_PREVIEW_BUTTON_OPTIONS,
                     },
                 },
             },
@@ -2014,7 +2218,7 @@ async function hazardRiskEntityFactory() {
                 name: 'defaultInitialRiskRatingId',
                 title: '@workplacesafety-management:hazard-risks.entities.hazard-risk.fields.default-initial-risk-rating-id.title',
                 groupId: 'risk-assessment',
-                options: listSortAndFilterOptions$2,
+                options: listSortAndFilterOptions$3,
                 schema: {
                     dataType: 'string',
                     nullable: true,
@@ -2040,7 +2244,7 @@ async function hazardRiskEntityFactory() {
                 name: 'defaultResidualRiskRatingId',
                 title: '@workplacesafety-management:hazard-risks.entities.hazard-risk.fields.default-residual-risk-rating-id.title',
                 groupId: 'risk-assessment',
-                options: listSortAndFilterOptions$2,
+                options: listSortAndFilterOptions$3,
                 schema: {
                     dataType: 'string',
                     nullable: true,
@@ -2077,43 +2281,220 @@ async function hazardRiskEntityFactory() {
                     },
                 },
             },
+        ],
+        columns: [
+            { name: 'code', options: { width: '120px', order: 1 } },
+            { name: 'title', options: { order: 2 } },
+            { name: 'hazardId', options: { dataPath: 'hazard.title', order: 3 } },
+            { name: 'riskMatrixId', options: { dataPath: 'riskMatrix.title', order: 4 } },
+            { name: 'defaultInitialRiskRatingId', options: { dataPath: 'defaultInitialRiskRating.title', order: 5 } },
+            { name: 'defaultResidualRiskRatingId', options: { dataPath: 'defaultResidualRiskRating.title', order: 6 } },
+        ],
+        interfaces: {
+            master: {
+                create: {
+                    sections: [
+                        { id: 'basic-info' },
+                        { id: 'risk-assessment' },
+                        { id: 'control-measures' },
+                    ],
+                    properties: [
+                        { name: 'code', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
+                        { name: 'title', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
+                        { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 3 } } } },
+                        { name: 'hazardId', layout: { positions: { lg: { colSpan: 6, order: 4 } } } },
+                        riskAssessmentPropertyLayout('riskMatrixId'),
+                        riskAssessmentPropertyLayout('riskMatrixPreview'),
+                        riskAssessmentPropertyLayout('defaultInitialRiskRatingId'),
+                        riskAssessmentPropertyLayout('defaultResidualRiskRatingId'),
+                        { name: 'controlMeasureIds', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
+                    ],
+                },
+                update: {
+                    sections: [
+                        { id: 'basic-info' },
+                        { id: 'risk-assessment' },
+                        { id: 'control-measures' },
+                    ],
+                    properties: [
+                        { name: 'code', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
+                        { name: 'title', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
+                        { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 3 } } } },
+                        { name: 'hazardId', layout: { positions: { lg: { colSpan: 6, order: 4 } } } },
+                        riskAssessmentPropertyLayout('riskMatrixId'),
+                        riskAssessmentPropertyLayout('riskMatrixPreview'),
+                        riskAssessmentPropertyLayout('defaultInitialRiskRatingId'),
+                        riskAssessmentPropertyLayout('defaultResidualRiskRatingId'),
+                        { name: 'controlMeasureIds', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
+                    ],
+                },
+                single: {
+                    title: '{{ title }}',
+                    sections: [
+                        { id: 'basic-info', layout: { positions: { lg: { colSpan: 12 } } } },
+                        { id: 'risk-assessment', layout: { positions: { lg: { colSpan: 12 } } } },
+                        { id: 'control-measures', layout: { positions: { lg: { colSpan: 12 } } } },
+                    ],
+                    properties: [
+                        { name: 'code', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
+                        { name: 'title', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
+                        { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 3 } } } },
+                        { name: 'hazardId', layout: { positions: { lg: { colSpan: 6, order: 4 } } } },
+                        riskAssessmentPropertyLayout('riskMatrixId'),
+                        riskAssessmentPropertyLayout('riskMatrixPreview'),
+                        riskAssessmentPropertyLayout('defaultInitialRiskRatingId'),
+                        riskAssessmentPropertyLayout('defaultResidualRiskRatingId'),
+                        { name: 'controlMeasureIds', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
+                    ],
+                    actions: [...entityMasterRecordActions()],
+                },
+                list: {
+                    actions: [...entityMasterCrudActions()],
+                    views: [createAllQueryView({ sorts: [{ name: 'code', dir: 'asc' }] })],
+                },
+            },
+        },
+    };
+    return entityDef;
+}
+//#endregion
+
+//#region ----   Imports   ----
+//#endregion
+
+var index$3 = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    hazardRiskEntityFactory: hazardRiskEntityFactory
+});
+
+//#endregion
+//#region ----   Constants   ----
+const listSortAndFilterOptions$2 = {
+    sort: { enabled: true },
+    filter: { advance: { enabled: true }, inline: { enabled: true } },
+};
+const noteFieldOptions = {
+    sort: { enabled: false },
+    filter: { advance: { enabled: true }, inline: { enabled: false } },
+};
+//#endregion
+//#region ----   Entity factory   ----
+async function hazardRiskPpeRuleEntityFactory() {
+    const entityDef = {
+        module: RootConfig.module.name,
+        name: RootConfig.entities.hazardRiskPpeRule.name,
+        title: RootConfig.entities.hazardRiskPpeRule.title,
+        icon: RootConfig.entities.hazardRiskPpeRule.icon,
+        formats: {
+            individual: RootConfig.entities.hazardRiskPpeRule.title,
+            plural: RootConfig.entities.hazardRiskPpeRule.titlePlural,
+            searchResult: {
+                title: '{{ ppeItem.title }}',
+                description: '{{ hazardRisk.title }}',
+            },
+        },
+        plugins: [
+            {
+                name: 'status',
+                options: {
+                    field: 'status',
+                    definition: 'workplacesafety-management.status.hazard-risk-ppe-rule',
+                    order: 1,
+                },
+            },
+        ],
+        groups: [
             {
-                name: 'responsibleRoleText',
-                title: '@workplacesafety-management:hazard-risks.entities.hazard-risk.fields.responsible-role-text.title',
-                groupId: 'compliance',
-                options: noteFieldOptions,
+                id: 'basic-info',
+                title: '@workplacesafety-management:hazard-risk-ppe-rules.entities.hazard-risk-ppe-rule.groups.basic-info',
+            },
+            {
+                id: 'configuration',
+                title: '@workplacesafety-management:hazard-risk-ppe-rules.entities.hazard-risk-ppe-rule.groups.configuration',
+            },
+            {
+                id: 'notes',
+                title: '@workplacesafety-management:hazard-risk-ppe-rules.entities.hazard-risk-ppe-rule.groups.notes',
+            },
+        ],
+        properties: [
+            {
+                name: 'id',
+                title: '@general:terms.common.id',
+                groupId: 'basic-info',
+                schema: { dataType: 'uuid', visible: false, nullable: false, readonly: true, unique: { enabled: true } },
+            },
+            {
+                name: 'hazardRiskId',
+                title: '@workplacesafety-management:hazard-risk-ppe-rules.entities.hazard-risk-ppe-rule.fields.hazard-risk-id.title',
+                groupId: 'basic-info',
+                options: listSortAndFilterOptions$2,
                 schema: {
                     dataType: 'string',
-                    nullable: true,
                     interface: {
-                        type: AXPWidgetsList.Editors.LargeTextBox,
+                        type: AXPWidgetsList.Editors.LookupBox,
                         options: {
-                            rows: 2,
-                            placeholder: '@workplacesafety-management:hazard-risks.entities.hazard-risk.fields.responsible-role-text.placeholder',
+                            look: 'select',
+                            entity: `${RootConfig.module.name}.${RootConfig.entities.hazardRisk.name}`,
+                            textField: 'title',
+                            valueField: 'id',
+                            columns: ['code', 'title'],
+                            expose: [
+                                { source: 'id', target: 'hazardRisk.id' },
+                                { source: 'title', target: 'hazardRisk.title' },
+                                { source: 'code', target: 'hazardRisk.code' },
+                            ],
                         },
                     },
                 },
+                validations: [{ rule: 'required' }],
             },
             {
-                name: 'legislationText',
-                title: '@workplacesafety-management:hazard-risks.entities.hazard-risk.fields.legislation-text.title',
-                groupId: 'compliance',
-                options: noteFieldOptions,
+                name: 'ppeItemId',
+                title: '@workplacesafety-management:hazard-risk-ppe-rules.entities.hazard-risk-ppe-rule.fields.ppe-item-id.title',
+                groupId: 'basic-info',
+                options: listSortAndFilterOptions$2,
                 schema: {
                     dataType: 'string',
-                    nullable: true,
                     interface: {
-                        type: AXPWidgetsList.Editors.LargeTextBox,
+                        type: AXPWidgetsList.Editors.LookupBox,
                         options: {
-                            rows: 2,
-                            placeholder: '@workplacesafety-management:hazard-risks.entities.hazard-risk.fields.legislation-text.placeholder',
+                            look: 'select',
+                            entity: `${RootConfig.module.name}.${RootConfig.entities.ppeItem.name}`,
+                            textField: 'title',
+                            valueField: 'id',
+                            columns: ['code', 'title'],
+                            expose: [
+                                { source: 'id', target: 'ppeItem.id' },
+                                { source: 'title', target: 'ppeItem.title' },
+                                { source: 'code', target: 'ppeItem.code' },
+                            ],
+                        },
+                    },
+                },
+                validations: [{ rule: 'required' }],
+            },
+            {
+                name: 'requirementType',
+                title: '@workplacesafety-management:hazard-risk-ppe-rules.entities.hazard-risk-ppe-rule.fields.requirement-type.title',
+                groupId: 'configuration',
+                options: listSortAndFilterOptions$2,
+                schema: {
+                    dataType: 'string',
+                    interface: {
+                        type: AXPWidgetsList.Editors.SelectBox,
+                        options: {
+                            valueField: 'id',
+                            textField: 'title',
+                            dataSource: [...WORKPLACE_SAFETY_HAZARD_PPE_RULE_REQUIREMENT_TYPE_OPTIONS],
                         },
                     },
                 },
+                validations: [{ rule: 'required' }],
             },
             {
                 name: 'conditionNote',
-                title: '@workplacesafety-management:hazard-risks.entities.hazard-risk.fields.condition-note.title',
+                title: '@workplacesafety-management:hazard-risk-ppe-rules.entities.hazard-risk-ppe-rule.fields.condition-note.title',
                 groupId: 'notes',
                 options: noteFieldOptions,
                 schema: {
@@ -2123,14 +2504,14 @@ async function hazardRiskEntityFactory() {
                         type: AXPWidgetsList.Editors.LargeTextBox,
                         options: {
                             rows: 2,
-                            placeholder: '@workplacesafety-management:hazard-risks.entities.hazard-risk.fields.condition-note.placeholder',
+                            placeholder: '@workplacesafety-management:hazard-risk-ppe-rules.entities.hazard-risk-ppe-rule.fields.condition-note.placeholder',
                         },
                     },
                 },
             },
             {
-                name: 'assessmentInstruction',
-                title: '@workplacesafety-management:hazard-risks.entities.hazard-risk.fields.assessment-instruction.title',
+                name: 'usageInstruction',
+                title: '@workplacesafety-management:hazard-risk-ppe-rules.entities.hazard-risk-ppe-rule.fields.usage-instruction.title',
                 groupId: 'notes',
                 options: noteFieldOptions,
                 schema: {
@@ -2139,101 +2520,60 @@ async function hazardRiskEntityFactory() {
                     interface: {
                         type: AXPWidgetsList.Editors.LargeTextBox,
                         options: {
-                            rows: 3,
-                            placeholder: '@workplacesafety-management:hazard-risks.entities.hazard-risk.fields.assessment-instruction.placeholder',
+                            rows: 2,
+                            placeholder: '@workplacesafety-management:hazard-risk-ppe-rules.entities.hazard-risk-ppe-rule.fields.usage-instruction.placeholder',
                         },
                     },
                 },
             },
         ],
         columns: [
-            { name: 'code', options: { width: '120px', order: 1 } },
-            { name: 'title', options: { order: 2 } },
-            { name: 'hazardId', options: { dataPath: 'hazard.title', order: 3 } },
-            { name: 'riskMatrixId', options: { dataPath: 'riskMatrix.title', order: 4 } },
-            { name: 'defaultInitialRiskRatingId', options: { dataPath: 'defaultInitialRiskRating.title', order: 5 } },
-            { name: 'defaultResidualRiskRatingId', options: { dataPath: 'defaultResidualRiskRating.title', order: 6 } },
-            { name: 'sortOrder', options: { width: '100px', order: 7 } },
+            { name: 'ppeItemId', options: { dataPath: 'ppeItem.title', order: 1 } },
+            { name: 'requirementType', options: { width: '140px', order: 2 } },
+            { name: 'conditionNote', options: { order: 3 } },
+            { name: 'usageInstruction', options: { order: 4 } },
         ],
         interfaces: {
             master: {
                 create: {
-                    sections: [
-                        { id: 'basic-info' },
-                        { id: 'risk-assessment' },
-                        { id: 'control-measures' },
-                        { id: 'compliance' },
-                        { id: 'notes' },
-                    ],
+                    sections: [{ id: 'basic-info' }, { id: 'configuration' }, { id: 'notes' }],
                     properties: [
-                        { name: 'code', layout: { positions: { lg: { colSpan: 4, order: 1 } } } },
-                        { name: 'sortOrder', layout: { positions: { lg: { colSpan: 4, order: 2 } } } },
-                        { name: 'title', layout: { positions: { lg: { colSpan: 12, order: 3 } } } },
-                        { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 4 } } } },
-                        { name: 'hazardId', layout: { positions: { lg: { colSpan: 6, order: 5 } } } },
-                        { name: 'riskMatrixId', layout: { positions: { lg: { colSpan: 6, order: 6 } } } },
-                        { name: 'defaultInitialRiskRatingId', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
-                        { name: 'defaultResidualRiskRatingId', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
-                        { name: 'controlMeasureIds', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
-                        { name: 'responsibleRoleText', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
-                        { name: 'legislationText', layout: { positions: { lg: { colSpan: 12, order: 2 } } } },
+                        { name: 'hazardRiskId', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
+                        { name: 'ppeItemId', layout: { positions: { lg: { colSpan: 12, order: 2 } } } },
+                        { name: 'requirementType', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
                         { name: 'conditionNote', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
-                        { name: 'assessmentInstruction', layout: { positions: { lg: { colSpan: 12, order: 2 } } } },
+                        { name: 'usageInstruction', layout: { positions: { lg: { colSpan: 12, order: 2 } } } },
                     ],
                 },
                 update: {
-                    sections: [
-                        { id: 'basic-info' },
-                        { id: 'risk-assessment' },
-                        { id: 'control-measures' },
-                        { id: 'compliance' },
-                        { id: 'notes' },
-                    ],
+                    sections: [{ id: 'basic-info' }, { id: 'configuration' }, { id: 'notes' }],
                     properties: [
-                        { name: 'code', layout: { positions: { lg: { colSpan: 4, order: 1 } } } },
-                        { name: 'sortOrder', layout: { positions: { lg: { colSpan: 4, order: 2 } } } },
-                        { name: 'title', layout: { positions: { lg: { colSpan: 12, order: 3 } } } },
-                        { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 4 } } } },
-                        { name: 'hazardId', layout: { positions: { lg: { colSpan: 6, order: 5 } } } },
-                        { name: 'riskMatrixId', layout: { positions: { lg: { colSpan: 6, order: 6 } } } },
-                        { name: 'defaultInitialRiskRatingId', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
-                        { name: 'defaultResidualRiskRatingId', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
-                        { name: 'controlMeasureIds', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
-                        { name: 'responsibleRoleText', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
-                        { name: 'legislationText', layout: { positions: { lg: { colSpan: 12, order: 2 } } } },
+                        { name: 'hazardRiskId', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
+                        { name: 'ppeItemId', layout: { positions: { lg: { colSpan: 12, order: 2 } } } },
+                        { name: 'requirementType', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
                         { name: 'conditionNote', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
-                        { name: 'assessmentInstruction', layout: { positions: { lg: { colSpan: 12, order: 2 } } } },
+                        { name: 'usageInstruction', layout: { positions: { lg: { colSpan: 12, order: 2 } } } },
                     ],
                 },
                 single: {
-                    title: '{{ title }}',
+                    title: '{{ ppeItem.title }}',
                     sections: [
                         { id: 'basic-info', layout: { positions: { lg: { colSpan: 12 } } } },
-                        { id: 'risk-assessment', layout: { positions: { lg: { colSpan: 12 } } } },
-                        { id: 'control-measures', layout: { positions: { lg: { colSpan: 12 } } } },
-                        { id: 'compliance', layout: { positions: { lg: { colSpan: 12 } } } },
+                        { id: 'configuration', layout: { positions: { lg: { colSpan: 12 } } } },
                         { id: 'notes', layout: { positions: { lg: { colSpan: 12 } } } },
                     ],
                     properties: [
-                        { name: 'code', layout: { positions: { lg: { colSpan: 4, order: 1 } } } },
-                        { name: 'sortOrder', layout: { positions: { lg: { colSpan: 4, order: 2 } } } },
-                        { name: 'title', layout: { positions: { lg: { colSpan: 12, order: 3 } } } },
-                        { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 4 } } } },
-                        { name: 'hazardId', layout: { positions: { lg: { colSpan: 6, order: 5 } } } },
-                        { name: 'riskMatrixId', layout: { positions: { lg: { colSpan: 6, order: 6 } } } },
-                        { name: 'defaultInitialRiskRatingId', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
-                        { name: 'defaultResidualRiskRatingId', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
-                        { name: 'controlMeasureIds', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
-                        { name: 'responsibleRoleText', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
-                        { name: 'legislationText', layout: { positions: { lg: { colSpan: 12, order: 2 } } } },
+                        { name: 'hazardRiskId', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
+                        { name: 'ppeItemId', layout: { positions: { lg: { colSpan: 12, order: 2 } } } },
+                        { name: 'requirementType', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
                         { name: 'conditionNote', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
-                        { name: 'assessmentInstruction', layout: { positions: { lg: { colSpan: 12, order: 2 } } } },
+                        { name: 'usageInstruction', layout: { positions: { lg: { colSpan: 12, order: 2 } } } },
                     ],
                     actions: [...entityMasterRecordActions()],
                 },
                 list: {
-                    actions: [...entityMasterCrudActions()],
-                    views: [createAllQueryView({ sorts: [{ name: 'sortOrder', dir: 'asc' }, { name: 'code', dir: 'asc' }] })],
+                    actions: [...entityDetailsCrudActions('hazardRiskId')],
+                    views: [createAllQueryView()],
                 },
             },
         },
@@ -2247,7 +2587,7 @@ async function hazardRiskEntityFactory() {
 
 var index$2 = /*#__PURE__*/Object.freeze({
     __proto__: null,
-    hazardRiskEntityFactory: hazardRiskEntityFactory
+    hazardRiskPpeRuleEntityFactory: hazardRiskPpeRuleEntityFactory
 });
 
 //#endregion
@@ -2295,10 +2635,6 @@ async function ppeItemEntityFactory() {
                 id: 'basic-info',
                 title: '@workplacesafety-management:ppe-items.entities.ppe-item.groups.basic-info',
             },
-            {
-                id: 'compliance',
-                title: '@workplacesafety-management:ppe-items.entities.ppe-item.groups.compliance',
-            },
             {
                 id: 'appearance',
                 title: '@general:terms.interface.appearance',
@@ -2346,29 +2682,9 @@ async function ppeItemEntityFactory() {
                 validations: [{ rule: 'required' }],
             },
             {
-                name: 'description',
-                title: '@general:terms.common.description',
+                name: 'serialNumber',
+                title: '@workplacesafety-management:ppe-items.entities.ppe-item.fields.serial-number.title',
                 groupId: 'basic-info',
-                options: {
-                    sort: { enabled: false },
-                    filter: { advance: { enabled: true }, inline: { enabled: false } },
-                },
-                schema: {
-                    dataType: 'string',
-                    nullable: true,
-                    interface: {
-                        type: AXPWidgetsList.Editors.LargeTextBox,
-                        options: {
-                            rows: 3,
-                            placeholder: '@workplacesafety-management:ppe-items.entities.ppe-item.fields.description.placeholder',
-                        },
-                    },
-                },
-            },
-            {
-                name: 'standardCode',
-                title: '@workplacesafety-management:ppe-items.entities.ppe-item.fields.standard-code.title',
-                groupId: 'compliance',
                 options: listSortAndFilterOptions$1,
                 schema: {
                     dataType: 'string',
@@ -2376,23 +2692,27 @@ async function ppeItemEntityFactory() {
                     interface: {
                         type: AXPWidgetsList.Editors.TextBox,
                         options: {
-                            placeholder: '@workplacesafety-management:ppe-items.entities.ppe-item.fields.standard-code.placeholder',
+                            placeholder: '@workplacesafety-management:ppe-items.entities.ppe-item.fields.serial-number.placeholder',
                         },
                     },
                 },
             },
             {
-                name: 'usageNote',
-                title: '@workplacesafety-management:ppe-items.entities.ppe-item.fields.usage-note.title',
-                groupId: 'compliance',
-                options: listSortAndFilterOptions$1,
+                name: 'description',
+                title: '@general:terms.common.description',
+                groupId: 'basic-info',
+                options: {
+                    sort: { enabled: false },
+                    filter: { advance: { enabled: true }, inline: { enabled: false } },
+                },
                 schema: {
                     dataType: 'string',
                     nullable: true,
                     interface: {
-                        type: AXPWidgetsList.Editors.TextBox,
+                        type: AXPWidgetsList.Editors.LargeTextBox,
                         options: {
-                            placeholder: '@workplacesafety-management:ppe-items.entities.ppe-item.fields.usage-note.placeholder',
+                            rows: 3,
+                            placeholder: '@workplacesafety-management:ppe-items.entities.ppe-item.fields.description.placeholder',
                         },
                     },
                 },
@@ -2402,7 +2722,7 @@ async function ppeItemEntityFactory() {
                 title: '@workplacesafety-management:ppe-items.entities.ppe-item.fields.icon.title',
                 groupId: 'appearance',
                 options: {
-                    sort: { enabled: false },
+                    sort: { enabled: true },
                     filter: { advance: { enabled: false }, inline: { enabled: false } },
                 },
                 schema: {
@@ -2411,57 +2731,60 @@ async function ppeItemEntityFactory() {
                     interface: {
                         type: AXPWidgetsList.Advanced.Image,
                         options: {
-                            type: 'profile-photo',
+                            width: '100%',
+                            aspectRatio: '1',
+                            objectFit: 'contain',
+                            borderRadius: '8px',
                         },
                     },
                 },
             },
         ],
         columns: [
-            { name: 'icon', options: { width: '72px', order: 1 } },
-            { name: 'code', options: { width: '140px', order: 2 } },
-            { name: 'title', options: { width: '220px', order: 3 } },
-            { name: 'standardCode', options: { width: '140px', order: 4 } },
-            { name: 'usageNote', options: { width: '180px', order: 5 } },
+            { name: 'code', options: { width: '140px', order: 1 } },
+            { name: 'title', options: { width: '220px', order: 2 } },
+            { name: 'serialNumber', options: { width: '140px', order: 3 } },
         ],
         interfaces: {
             master: {
                 create: {
-                    sections: [{ id: 'basic-info' }, { id: 'compliance' }, { id: 'appearance' }],
+                    sections: [
+                        { id: 'basic-info', order: 1, layout: { positions: { lg: { colSpan: 8, colStart: 1 } } } },
+                        { id: 'appearance', order: 1, layout: { positions: { lg: { colSpan: 4, colStart: 9 } } } },
+                    ],
                     properties: [
-                        { name: 'code', layout: { positions: { lg: { colSpan: 4, order: 1 } } } },
-                        { name: 'title', layout: { positions: { lg: { colSpan: 8, order: 2 } } } },
-                        { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 3 } } } },
-                        { name: 'standardCode', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
-                        { name: 'usageNote', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
-                        { name: 'icon', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
+                        { name: 'code', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
+                        { name: 'title', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
+                        { name: 'serialNumber', layout: { positions: { lg: { colSpan: 12, order: 3 } } } },
+                        { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 4 } } } },
+                        { name: 'icon', layout: { label: { visible: false }, positions: { lg: { colSpan: 12 } } } },
                     ],
                 },
                 update: {
-                    sections: [{ id: 'basic-info' }, { id: 'compliance' }, { id: 'appearance' }],
+                    sections: [
+                        { id: 'basic-info', order: 1, layout: { positions: { lg: { colSpan: 8, colStart: 1 } } } },
+                        { id: 'appearance', order: 1, layout: { positions: { lg: { colSpan: 4, colStart: 9 } } } },
+                    ],
                     properties: [
-                        { name: 'code', layout: { positions: { lg: { colSpan: 4, order: 1 } } } },
-                        { name: 'title', layout: { positions: { lg: { colSpan: 8, order: 2 } } } },
-                        { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 3 } } } },
-                        { name: 'standardCode', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
-                        { name: 'usageNote', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
-                        { name: 'icon', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
+                        { name: 'code', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
+                        { name: 'title', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
+                        { name: 'serialNumber', layout: { positions: { lg: { colSpan: 12, order: 3 } } } },
+                        { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 4 } } } },
+                        { name: 'icon', layout: { label: { visible: false }, positions: { lg: { colSpan: 12 } } } },
                     ],
                 },
                 single: {
                     title: '{{ title }}',
                     sections: [
-                        { id: 'basic-info', layout: { positions: { lg: { colSpan: 12 } } } },
-                        { id: 'compliance', layout: { positions: { lg: { colSpan: 12 } } } },
-                        { id: 'appearance', layout: { positions: { lg: { colSpan: 12 } } } },
+                        { id: 'basic-info', order: 1, layout: { positions: { lg: { colSpan: 8, colStart: 1 } } } },
+                        { id: 'appearance', order: 1, layout: { positions: { lg: { colSpan: 4, colStart: 9 } } } },
                     ],
                     properties: [
-                        { name: 'code', layout: { positions: { lg: { colSpan: 4, order: 1 } } } },
-                        { name: 'title', layout: { positions: { lg: { colSpan: 8, order: 2 } } } },
-                        { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 3 } } } },
-                        { name: 'standardCode', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
-                        { name: 'usageNote', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
-                        { name: 'icon', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
+                        { name: 'code', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
+                        { name: 'title', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
+                        { name: 'serialNumber', layout: { positions: { lg: { colSpan: 12, order: 3 } } } },
+                        { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 4 } } } },
+                        { name: 'icon', layout: { label: { visible: false }, positions: { lg: { colSpan: 12 } } } },
                     ],
                     actions: [...entityMasterRecordActions()],
                 },
@@ -2647,5 +2970,5 @@ var index = /*#__PURE__*/Object.freeze({
  * Generated bundle index. Do not edit.
  */
 
-export { AXMHazardPpeRuleRequirementType, AXMHazardRegisterContextType, AXMWorkplaceSafetyManagementEntityProvider, AXMWorkplaceSafetyManagementMenuProvider, AXMWorkplaceSafetyManagementModule, AXMWorkplaceSafetyManagementPermissionKeys, AXMWorkplaceSafetyManagementSearchCommandProvider, RISK_MANAGEMENT_HAZARD_CATALOG_SCOPE, RISK_MANAGEMENT_RISK_MATRIX_CELL_ENTITY, RootConfig, WORKPLACE_SAFETY_GHS_SYMBOL_OPTIONS, WORKPLACE_SAFETY_HAZARD_PPE_RULE_REQUIREMENT_TYPE_OPTIONS, controlHierarchyLevelsEntityFactory, controlMeasureEntityFactory, hazardEntityFactory, hazardPpeRuleEntityFactory, hazardRegisterEntityFactory, hazardRiskEntityFactory, ppeItemEntityFactory, riskRatingEntityFactory };
+export { AXMHazardPpeRuleRequirementType, AXMHazardRegisterContextType, AXMWorkplaceSafetyManagementEntityProvider, AXMWorkplaceSafetyManagementMenuProvider, AXMWorkplaceSafetyManagementModule, AXMWorkplaceSafetyManagementPermissionKeys, AXMWorkplaceSafetyManagementSearchCommandProvider, RISK_MANAGEMENT_HAZARD_CATALOG_SCOPE, RISK_MANAGEMENT_RISK_MATRIX_CELL_ENTITY, RootConfig, WORKPLACE_SAFETY_GHS_SYMBOL_OPTIONS, WORKPLACE_SAFETY_HAZARD_PPE_RULE_REQUIREMENT_TYPE_OPTIONS, controlHierarchyLevelsEntityFactory, controlMeasureEntityFactory, hazardEntityFactory, hazardPpeRuleEntityFactory, hazardRegisterEntityFactory, hazardRiskEntityFactory, hazardRiskPpeRuleEntityFactory, ppeItemEntityFactory, riskRatingEntityFactory };
 //# sourceMappingURL=acorex-modules-workplacesafety-management.mjs.map