@acorex/modules 21.0.0-next.74 → 21.0.0-next.76

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

@@ -1,11 +1,122 @@
 import { AXP_IDENTIFIER_RULES } from '@acorex/modules/identifier-management';
 import { AXP_PERMISSION_DEFINITION_PROVIDER } from '@acorex/platform/auth';
-import { AXPSearchCommandProvider, AXP_MENU_PROVIDER, AXP_SEARCH_PROVIDER, AXP_STATUS_PROVIDERS, createAllQueryView } from '@acorex/platform/common';
+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, entityMasterCrudActions, entityMasterRecordActions, entityDetailsCrudActions, entityDetailsSimpleCondition } from '@acorex/platform/layout/entity';
+import { AXPEntityService, AXP_ENTITY_DEFINITION_LOADER } from '@acorex/platform/layout/entity';
 import * as i0 from '@angular/core';
 import { Injectable, inject, NgModule } from '@angular/core';
-import { AXPCommonMenuKeys, AXPWidgetsList } from '@acorex/modules/common';
+import { AXPCommonMenuKeys } from '@acorex/modules/common';
+import { createAllQueryView, entityMasterCrudActions, entityMasterRecordActions, AXPWidgetsList, entityDetailsCrudActions, entityDetailsSimpleCondition } from '@acorex/platform/contracts';
+
+//#region ----   GHS symbol options   ----
+/** Asset base path for GHS pictograms (served from demo app assets). */
+const GHS_IMAGE_BASE = '/assets/workplacesafety-management/ghs';
+const WORKPLACE_SAFETY_GHS_SYMBOL_OPTIONS = [
+    {
+        id: 'GHS01',
+        title: 'GHS01 — Exploding bomb',
+        description: 'Explosion, blast or projection hazard.',
+        imageUrl: `${GHS_IMAGE_BASE}/explos.gif`,
+    },
+    {
+        id: 'GHS02',
+        title: 'GHS02 — Flame',
+        description: 'Flammable liquids, solids and gases; including self-reactive substances.',
+        imageUrl: `${GHS_IMAGE_BASE}/flamme.gif`,
+    },
+    {
+        id: 'GHS03',
+        title: 'GHS03 — Flame over circle',
+        description: 'Oxidising liquids, solids and gases; may cause or intensify fire.',
+        imageUrl: `${GHS_IMAGE_BASE}/rondflam.gif`,
+    },
+    {
+        id: 'GHS04',
+        title: 'GHS04 — Gas cylinder',
+        description: 'Gases under pressure.',
+        imageUrl: `${GHS_IMAGE_BASE}/bottle.gif`,
+    },
+    {
+        id: 'GHS05',
+        title: 'GHS05 — Skull and crossbones',
+        description: 'Fatal or toxic if swallowed, inhaled or in contact with skin.',
+        imageUrl: `${GHS_IMAGE_BASE}/skull.gif`,
+    },
+    {
+        id: 'GHS06',
+        title: 'GHS06 — Exclamation mark',
+        description: 'Low level toxicity; irritant or harmful to health.',
+        imageUrl: `${GHS_IMAGE_BASE}/exclam.gif`,
+    },
+    {
+        id: 'GHS07',
+        title: 'GHS07 — Corrosion',
+        description: 'Corrosive chemicals; may cause severe skin and eye damage.',
+        imageUrl: `${GHS_IMAGE_BASE}/acid_red.gif`,
+    },
+    {
+        id: 'GHS08',
+        title: 'GHS08 — Health hazard',
+        description: 'Chronic health hazards; carcinogenicity, mutagenicity, reproductive toxicity.',
+        imageUrl: `${GHS_IMAGE_BASE}/silhouete.gif`,
+    },
+    {
+        id: 'GHS09',
+        title: 'GHS09 — Environment',
+        description: 'Hazardous to aquatic life and the environment.',
+        imageUrl: `${GHS_IMAGE_BASE}/Aquatic-pollut-red.gif`,
+    },
+];
+//#endregion
+
+//#region ----   Permission keys   ----
+const AXMWorkplaceSafetyManagementPermissionKeys = {
+    WorkplaceSafetyManagement: {
+        Management: 'WorkplaceSafetyManagement:Permission:WorkplaceSafetyManagement.Management',
+        Hazard: {
+            Management: 'WorkplaceSafetyManagement:Permission:Hazard.Management',
+            View: 'WorkplaceSafetyManagement:Permission:Hazard.View',
+            Create: 'WorkplaceSafetyManagement:Permission:Hazard.Create',
+            Update: 'WorkplaceSafetyManagement:Permission:Hazard.Update',
+            Delete: 'WorkplaceSafetyManagement:Permission:Hazard.Delete',
+        },
+        HazardRegister: {
+            Management: 'WorkplaceSafetyManagement:Permission:HazardRegister.Management',
+            View: 'WorkplaceSafetyManagement:Permission:HazardRegister.View',
+            Create: 'WorkplaceSafetyManagement:Permission:HazardRegister.Create',
+            Update: 'WorkplaceSafetyManagement:Permission:HazardRegister.Update',
+            Delete: 'WorkplaceSafetyManagement:Permission:HazardRegister.Delete',
+        },
+        RiskRating: {
+            Management: 'WorkplaceSafetyManagement:Permission:RiskRating.Management',
+        },
+        PpeItem: {
+            Management: 'WorkplaceSafetyManagement:Permission:PpeItem.Management',
+            View: 'WorkplaceSafetyManagement:Permission:PpeItem.View',
+            Create: 'WorkplaceSafetyManagement:Permission:PpeItem.Create',
+            Update: 'WorkplaceSafetyManagement:Permission:PpeItem.Update',
+            Delete: 'WorkplaceSafetyManagement:Permission:PpeItem.Delete',
+        },
+        HazardPpeRule: {
+            Management: 'WorkplaceSafetyManagement:Permission:HazardPpeRule.Management',
+            View: 'WorkplaceSafetyManagement:Permission:HazardPpeRule.View',
+            Create: 'WorkplaceSafetyManagement:Permission:HazardPpeRule.Create',
+            Update: 'WorkplaceSafetyManagement:Permission:HazardPpeRule.Update',
+            Delete: 'WorkplaceSafetyManagement:Permission:HazardPpeRule.Delete',
+        },
+        HazardRisk: {
+            Management: 'WorkplaceSafetyManagement:Permission:HazardRisk.Management',
+            View: 'WorkplaceSafetyManagement:Permission:HazardRisk.View',
+            Create: 'WorkplaceSafetyManagement:Permission:HazardRisk.Create',
+            Update: 'WorkplaceSafetyManagement:Permission:HazardRisk.Update',
+            Delete: 'WorkplaceSafetyManagement:Permission:HazardRisk.Delete',
+        },
+        ControlMeasureType: {
+            Management: 'WorkplaceSafetyManagement:Permission:ControlMeasureType.Management',
+        },
+    },
+};
+//#endregion
 
 const config = {
     i18n: 'workplacesafety-management',
@@ -52,11 +163,61 @@ const RootConfig = {
             source: `${config.module}.HazardPpeRule`,
             title: `@${config.i18n}:hazard-ppe-rules.entities.hazard-ppe-rule.title`,
             titlePlural: `@${config.i18n}:hazard-ppe-rules.entities.hazard-ppe-rule.plural`,
-            icon: 'fa-light fa-list-check',
+            icon: 'fa-light fa-user-helmet-safety',
+        },
+        hazardRisk: {
+            name: 'HazardRisk',
+            source: `${config.module}.HazardRisk`,
+            title: `@${config.i18n}:hazard-risks.entities.hazard-risk.title`,
+            titlePlural: `@${config.i18n}:hazard-risks.entities.hazard-risk.plural`,
+            icon: 'fa-light fa-shield-exclamation',
+        },
+        controlMeasureType: {
+            name: 'ControlMeasureType',
+            source: `${config.module}.ControlMeasureType`,
+            title: `@${config.i18n}:control-measure-types.entities.control-measure-type.title`,
+            titlePlural: `@${config.i18n}:control-measure-types.entities.control-measure-type.plural`,
+            icon: 'fa-light fa-layer-group',
         },
     },
 };
 
+//#region ----   Imports   ----
+//#endregion
+//#region ----   Enums   ----
+var AXMHazardPpeRuleRequirementType;
+(function (AXMHazardPpeRuleRequirementType) {
+    AXMHazardPpeRuleRequirementType["Required"] = "required";
+    AXMHazardPpeRuleRequirementType["Recommended"] = "recommended";
+    AXMHazardPpeRuleRequirementType["Conditional"] = "conditional";
+})(AXMHazardPpeRuleRequirementType || (AXMHazardPpeRuleRequirementType = {}));
+//#endregion
+
+//#region ----   Hazard PPE rule requirement type options   ----
+const WORKPLACE_SAFETY_HAZARD_PPE_RULE_REQUIREMENT_TYPE_OPTIONS = [
+    {
+        id: AXMHazardPpeRuleRequirementType.Required,
+        title: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.fields.requirement-type.options.required',
+    },
+    {
+        id: AXMHazardPpeRuleRequirementType.Recommended,
+        title: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.fields.requirement-type.options.recommended',
+    },
+    {
+        id: AXMHazardPpeRuleRequirementType.Conditional,
+        title: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.fields.requirement-type.options.conditional',
+    },
+];
+//#endregion
+
+/** Risk matrix cell entity key in the risk-management module. */
+const RISK_MANAGEMENT_RISK_MATRIX_CELL_ENTITY = 'RiskManagement.RiskMatrixCell';
+/** Hazard catalog scope for risk matrix lookup filtering. */
+const RISK_MANAGEMENT_HAZARD_CATALOG_SCOPE = 'risk-management.hazard';
+
+//#region ---- Contracts barrel ----
+//#endregion
+
 class AXMWorkplaceSafetyManagementEntityProvider {
     preload() {
         const module = RootConfig.module.name;
@@ -71,15 +232,19 @@ class AXMWorkplaceSafetyManagementEntityProvider {
         }
         switch (entityName) {
             case RootConfig.entities.hazard.name:
-                return (await Promise.resolve().then(function () { return hazard_entity; })).hazardEntityFactory();
+                return (await Promise.resolve().then(function () { return index$5; })).hazardEntityFactory();
             case RootConfig.entities.hazardRegister.name:
-                return (await Promise.resolve().then(function () { return hazardRegister_entity; })).hazardRegisterEntityFactory();
+                return (await Promise.resolve().then(function () { return index$3; })).hazardRegisterEntityFactory();
             case RootConfig.entities.riskRating.name:
-                return (await Promise.resolve().then(function () { return riskRating_entity; })).riskRatingEntityFactory();
+                return (await Promise.resolve().then(function () { return index; })).riskRatingEntityFactory();
             case RootConfig.entities.ppeItem.name:
-                return (await Promise.resolve().then(function () { return ppeItem_entity; })).ppeItemEntityFactory();
+                return (await Promise.resolve().then(function () { return index$1; })).ppeItemEntityFactory();
             case RootConfig.entities.hazardPpeRule.name:
-                return (await Promise.resolve().then(function () { return hazardPpeRule_entity; })).hazardPpeRuleEntityFactory();
+                return (await Promise.resolve().then(function () { return index$4; })).hazardPpeRuleEntityFactory();
+            case RootConfig.entities.hazardRisk.name:
+                return (await Promise.resolve().then(function () { return index$2; })).hazardRiskEntityFactory();
+            case RootConfig.entities.controlMeasureType.name:
+                return (await Promise.resolve().then(function () { return index$6; })).controlMeasureTypeEntityFactory();
             default:
                 return null;
         }
@@ -103,45 +268,6 @@ const WorkplaceSafetyManagementManifest = {
     i18n: RootConfig.config.i18n,
 };
 
-//#region ----   Permission keys   ----
-const AXMWorkplaceSafetyManagementPermissionKeys = {
-    WorkplaceSafetyManagement: {
-        Management: 'WorkplaceSafetyManagement:Permission:WorkplaceSafetyManagement.Management',
-        Hazard: {
-            Management: 'WorkplaceSafetyManagement:Permission:Hazard.Management',
-            View: 'WorkplaceSafetyManagement:Permission:Hazard.View',
-            Create: 'WorkplaceSafetyManagement:Permission:Hazard.Create',
-            Update: 'WorkplaceSafetyManagement:Permission:Hazard.Update',
-            Delete: 'WorkplaceSafetyManagement:Permission:Hazard.Delete',
-        },
-        HazardRegister: {
-            Management: 'WorkplaceSafetyManagement:Permission:HazardRegister.Management',
-            View: 'WorkplaceSafetyManagement:Permission:HazardRegister.View',
-            Create: 'WorkplaceSafetyManagement:Permission:HazardRegister.Create',
-            Update: 'WorkplaceSafetyManagement:Permission:HazardRegister.Update',
-            Delete: 'WorkplaceSafetyManagement:Permission:HazardRegister.Delete',
-        },
-        RiskRating: {
-            Management: 'WorkplaceSafetyManagement:Permission:RiskRating.Management',
-        },
-        PpeItem: {
-            Management: 'WorkplaceSafetyManagement:Permission:PpeItem.Management',
-            View: 'WorkplaceSafetyManagement:Permission:PpeItem.View',
-            Create: 'WorkplaceSafetyManagement:Permission:PpeItem.Create',
-            Update: 'WorkplaceSafetyManagement:Permission:PpeItem.Update',
-            Delete: 'WorkplaceSafetyManagement:Permission:PpeItem.Delete',
-        },
-        HazardPpeRule: {
-            Management: 'WorkplaceSafetyManagement:Permission:HazardPpeRule.Management',
-            View: 'WorkplaceSafetyManagement:Permission:HazardPpeRule.View',
-            Create: 'WorkplaceSafetyManagement:Permission:HazardPpeRule.Create',
-            Update: 'WorkplaceSafetyManagement:Permission:HazardPpeRule.Update',
-            Delete: 'WorkplaceSafetyManagement:Permission:HazardPpeRule.Delete',
-        },
-    },
-};
-//#endregion
-
 class AXMWorkplaceSafetyManagementMenuProvider {
     constructor() {
         this.entityService = inject(AXPEntityService);
@@ -177,6 +303,15 @@ class AXMWorkplaceSafetyManagementMenuProvider {
                             permissions: [permissions.PpeItem.View],
                         },
                     },
+                    {
+                        text: RootConfig.entities.controlMeasureType.titlePlural,
+                        path: this.entityService.createPath(module.name, RootConfig.entities.controlMeasureType.name),
+                        icon: RootConfig.entities.controlMeasureType.icon,
+                        priority: 3,
+                        policy: {
+                            permissions: [permissions.ControlMeasureType.Management],
+                        },
+                    },
                 ],
             },
         ]);
@@ -195,6 +330,8 @@ class AXMWorkplaceSafetyManagementPermissionDefinitionProvider {
         const RISK_RATING_PERMISSIONS = '@workplacesafety-management:risk-ratings.permissions.risk-rating';
         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 CONTROL_MEASURE_TYPE_PERMISSIONS = '@workplacesafety-management:control-measure-types.permissions.control-measure-type';
         context
             .addGroup(RootConfig.module.name, `${MODULE_PERMISSIONS}.title`, `${MODULE_PERMISSIONS}.description`)
             .addPermission(keys.Hazard.Management, `${HAZARD_PERMISSIONS}.management.title`, `${HAZARD_PERMISSIONS}.management.description`)
@@ -223,6 +360,14 @@ class AXMWorkplaceSafetyManagementPermissionDefinitionProvider {
             .addChild(keys.HazardPpeRule.Update, `${HAZARD_PPE_RULE_PERMISSIONS}.update.title`, `${HAZARD_PPE_RULE_PERMISSIONS}.update.description`)
             .addChild(keys.HazardPpeRule.Delete, `${HAZARD_PPE_RULE_PERMISSIONS}.delete.title`, `${HAZARD_PPE_RULE_PERMISSIONS}.delete.description`)
             .endPermission()
+            .addPermission(keys.HazardRisk.Management, `${HAZARD_RISK_PERMISSIONS}.management.title`, `${HAZARD_RISK_PERMISSIONS}.management.description`)
+            .addChild(keys.HazardRisk.View, `${HAZARD_RISK_PERMISSIONS}.view.title`, `${HAZARD_RISK_PERMISSIONS}.view.description`)
+            .addChild(keys.HazardRisk.Create, `${HAZARD_RISK_PERMISSIONS}.create.title`, `${HAZARD_RISK_PERMISSIONS}.create.description`)
+            .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.ControlMeasureType.Management, `${CONTROL_MEASURE_TYPE_PERMISSIONS}.management.title`, `${CONTROL_MEASURE_TYPE_PERMISSIONS}.management.description`)
+            .endPermission()
             .endGroup();
     }
 }
@@ -267,6 +412,16 @@ const AXM_HAZARD_PPE_RULE_CODE_IDENTIFIER_RULE = {
     scopeConfig: { byTenant: true, period: 'none', minValue: 1, blockSize: 0 },
 };
 
+const AXM_HAZARD_RISK_CODE_IDENTIFIER_RULE = {
+    id: 'hazard-risk-code',
+    title: 'Hazard Risk Code',
+    entity: RootConfig.entities.hazardRisk.source,
+    pattern: 'HZR-{seq:4}',
+    enabled: true,
+    priority: 1,
+    scopeConfig: { byTenant: true, period: 'none', minValue: 1, blockSize: 0 },
+};
+
 //#region ----   Imports   ----
 //#endregion
 //#region ----   Identifier rule   ----
@@ -300,6 +455,11 @@ class AXMWorkplaceSafetyManagementModule {
                 multi: true,
                 useValue: AXM_HAZARD_PPE_RULE_CODE_IDENTIFIER_RULE,
             },
+            {
+                provide: AXP_IDENTIFIER_RULES,
+                multi: true,
+                useValue: AXM_HAZARD_RISK_CODE_IDENTIFIER_RULE,
+            },
             {
                 provide: AXP_IDENTIFIER_RULES,
                 multi: true,
@@ -330,9 +490,10 @@ class AXMWorkplaceSafetyManagementModule {
                 useClass: AXMWorkplaceSafetyManagementSearchCommandProvider,
                 multi: true,
             },
-            provideLazyProvider(AXP_STATUS_PROVIDERS, () => import('./acorex-modules-workplacesafety-management-hazard-status.provider-v1cFaa3q.mjs').then((m) => m.AXMWorkplaceSafetyManagementHazardStatusProvider)),
-            provideLazyProvider(AXP_STATUS_PROVIDERS, () => import('./acorex-modules-workplacesafety-management-ppe-item-status.provider-VH_Bp0l5.mjs').then((m) => m.AXMWorkplaceSafetyManagementPpeItemStatusProvider)),
-            provideLazyProvider(AXP_STATUS_PROVIDERS, () => import('./acorex-modules-workplacesafety-management-hazard-ppe-rule-status.provider-D1a0CBhs.mjs').then((m) => m.AXMWorkplaceSafetyManagementHazardPpeRuleStatusProvider)),
+            provideLazyProvider(AXP_STATUS_PROVIDERS, () => import('./acorex-modules-workplacesafety-management-hazard-status.provider-CmtTvpk0.mjs').then((m) => m.AXMWorkplaceSafetyManagementHazardStatusProvider)),
+            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)),
         ] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXMWorkplaceSafetyManagementModule, decorators: [{
@@ -355,6 +516,11 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
                             multi: true,
                             useValue: AXM_HAZARD_PPE_RULE_CODE_IDENTIFIER_RULE,
                         },
+                        {
+                            provide: AXP_IDENTIFIER_RULES,
+                            multi: true,
+                            useValue: AXM_HAZARD_RISK_CODE_IDENTIFIER_RULE,
+                        },
                         {
                             provide: AXP_IDENTIFIER_RULES,
                             multi: true,
@@ -385,78 +551,201 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
                             useClass: AXMWorkplaceSafetyManagementSearchCommandProvider,
                             multi: true,
                         },
-                        provideLazyProvider(AXP_STATUS_PROVIDERS, () => import('./acorex-modules-workplacesafety-management-hazard-status.provider-v1cFaa3q.mjs').then((m) => m.AXMWorkplaceSafetyManagementHazardStatusProvider)),
-                        provideLazyProvider(AXP_STATUS_PROVIDERS, () => import('./acorex-modules-workplacesafety-management-ppe-item-status.provider-VH_Bp0l5.mjs').then((m) => m.AXMWorkplaceSafetyManagementPpeItemStatusProvider)),
-                        provideLazyProvider(AXP_STATUS_PROVIDERS, () => import('./acorex-modules-workplacesafety-management-hazard-ppe-rule-status.provider-D1a0CBhs.mjs').then((m) => m.AXMWorkplaceSafetyManagementHazardPpeRuleStatusProvider)),
+                        provideLazyProvider(AXP_STATUS_PROVIDERS, () => import('./acorex-modules-workplacesafety-management-hazard-status.provider-CmtTvpk0.mjs').then((m) => m.AXMWorkplaceSafetyManagementHazardStatusProvider)),
+                        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)),
                     ],
                 }]
         }] });
 
-//#region ----   GHS symbol options   ----
-/** Asset base path for GHS pictograms (served from demo app assets). */
-const GHS_IMAGE_BASE = '/assets/workplacesafety-management/ghs';
-const WORKPLACE_SAFETY_GHS_SYMBOL_OPTIONS = [
-    {
-        id: 'GHS01',
-        title: 'GHS01 — Exploding bomb',
-        description: 'Explosion, blast or projection hazard.',
-        imageUrl: `${GHS_IMAGE_BASE}/explos.gif`,
-    },
-    {
-        id: 'GHS02',
-        title: 'GHS02 — Flame',
-        description: 'Flammable liquids, solids and gases; including self-reactive substances.',
-        imageUrl: `${GHS_IMAGE_BASE}/flamme.gif`,
-    },
-    {
-        id: 'GHS03',
-        title: 'GHS03 — Flame over circle',
-        description: 'Oxidising liquids, solids and gases; may cause or intensify fire.',
-        imageUrl: `${GHS_IMAGE_BASE}/rondflam.gif`,
-    },
-    {
-        id: 'GHS04',
-        title: 'GHS04 — Gas cylinder',
-        description: 'Gases under pressure.',
-        imageUrl: `${GHS_IMAGE_BASE}/bottle.gif`,
-    },
-    {
-        id: 'GHS05',
-        title: 'GHS05 — Skull and crossbones',
-        description: 'Fatal or toxic if swallowed, inhaled or in contact with skin.',
-        imageUrl: `${GHS_IMAGE_BASE}/skull.gif`,
-    },
-    {
-        id: 'GHS06',
-        title: 'GHS06 — Exclamation mark',
-        description: 'Low level toxicity; irritant or harmful to health.',
-        imageUrl: `${GHS_IMAGE_BASE}/exclam.gif`,
-    },
-    {
-        id: 'GHS07',
-        title: 'GHS07 — Corrosion',
-        description: 'Corrosive chemicals; may cause severe skin and eye damage.',
-        imageUrl: `${GHS_IMAGE_BASE}/acid_red.gif`,
-    },
-    {
-        id: 'GHS08',
-        title: 'GHS08 — Health hazard',
-        description: 'Chronic health hazards; carcinogenicity, mutagenicity, reproductive toxicity.',
-        imageUrl: `${GHS_IMAGE_BASE}/silhouete.gif`,
-    },
-    {
-        id: 'GHS09',
-        title: 'GHS09 — Environment',
-        description: 'Hazardous to aquatic life and the environment.',
-        imageUrl: `${GHS_IMAGE_BASE}/Aquatic-pollut-red.gif`,
-    },
-];
-//#endregion
-
 //#region ----   Imports   ----
 //#endregion
 //#region ----   Constants   ----
-const listSortAndFilterOptions$4 = {
+const listSortAndFilterOptions$6 = {
+    sort: { enabled: true },
+    filter: { advance: { enabled: true }, inline: { enabled: true } },
+};
+//#endregion
+//#region ----   Entity factory   ----
+async function controlMeasureTypeEntityFactory() {
+    const entityDef = {
+        module: RootConfig.module.name,
+        name: RootConfig.entities.controlMeasureType.name,
+        title: RootConfig.entities.controlMeasureType.title,
+        icon: RootConfig.entities.controlMeasureType.icon,
+        formats: {
+            individual: RootConfig.entities.controlMeasureType.title,
+            plural: RootConfig.entities.controlMeasureType.titlePlural,
+            searchResult: {
+                title: '{{ title }}',
+                description: '{{ code }}',
+            },
+        },
+        groups: [
+            {
+                id: 'basic-info',
+                title: '@workplacesafety-management:control-measure-types.entities.control-measure-type.groups.basic-info',
+            },
+        ],
+        properties: [
+            {
+                name: 'id',
+                title: '@general:terms.common.id',
+                groupId: 'basic-info',
+                schema: { dataType: 'uuid', visible: false, nullable: false, readonly: true, unique: { enabled: true } },
+            },
+            {
+                name: 'code',
+                title: '@workplacesafety-management:control-measure-types.entities.control-measure-type.fields.code.title',
+                groupId: 'basic-info',
+                options: listSortAndFilterOptions$6,
+                schema: {
+                    dataType: 'string',
+                    unique: { enabled: true },
+                    interface: {
+                        type: AXPWidgetsList.Editors.TextBox,
+                        options: {
+                            placeholder: '@workplacesafety-management:control-measure-types.entities.control-measure-type.fields.code.placeholder',
+                        },
+                    },
+                },
+                validations: [{ rule: 'required' }],
+            },
+            {
+                name: 'title',
+                title: '@workplacesafety-management:control-measure-types.entities.control-measure-type.fields.title.title',
+                groupId: 'basic-info',
+                options: listSortAndFilterOptions$6,
+                schema: {
+                    dataType: 'string',
+                    interface: {
+                        type: AXPWidgetsList.Editors.TextBox,
+                        options: {
+                            placeholder: '@workplacesafety-management:control-measure-types.entities.control-measure-type.fields.title.placeholder',
+                        },
+                    },
+                },
+                validations: [{ rule: 'required' }],
+            },
+            {
+                name: 'effectivenessLevel',
+                title: '@workplacesafety-management:control-measure-types.entities.control-measure-type.fields.effectiveness-level.title',
+                groupId: 'basic-info',
+                options: listSortAndFilterOptions$6,
+                schema: {
+                    dataType: 'number',
+                    interface: {
+                        type: AXPWidgetsList.Editors.NumberBox,
+                        options: {
+                            minValue: 1,
+                            maxValue: 10,
+                            placeholder: '@workplacesafety-management:control-measure-types.entities.control-measure-type.fields.effectiveness-level.placeholder',
+                        },
+                    },
+                },
+                validations: [{ rule: 'required' }],
+            },
+            {
+                name: 'order',
+                title: '@workplacesafety-management:control-measure-types.entities.control-measure-type.fields.order.title',
+                groupId: 'basic-info',
+                options: listSortAndFilterOptions$6,
+                schema: {
+                    dataType: 'number',
+                    interface: {
+                        type: AXPWidgetsList.Editors.NumberBox,
+                        options: {
+                            minValue: 0,
+                            placeholder: '@workplacesafety-management:control-measure-types.entities.control-measure-type.fields.order.placeholder',
+                        },
+                    },
+                },
+                validations: [{ rule: 'required' }],
+            },
+            {
+                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.LargeTextBox,
+                        options: {
+                            rows: 3,
+                            placeholder: '@workplacesafety-management:control-measure-types.entities.control-measure-type.fields.description.placeholder',
+                        },
+                    },
+                },
+            },
+        ],
+        columns: [
+            { name: 'order', options: { width: '90px', order: 1 } },
+            { name: 'code', options: { width: '160px', order: 2 } },
+            { name: 'title', options: { width: '220px', order: 3 } },
+            { name: 'effectivenessLevel', options: { width: '140px', order: 4 } },
+        ],
+        interfaces: {
+            master: {
+                create: {
+                    sections: [{ id: 'basic-info' }],
+                    properties: [
+                        { name: 'code', layout: { positions: { lg: { colSpan: 4, order: 1 } } } },
+                        { name: 'title', layout: { positions: { lg: { colSpan: 8, order: 2 } } } },
+                        { name: 'effectivenessLevel', layout: { positions: { lg: { colSpan: 4, order: 3 } } } },
+                        { name: 'order', layout: { positions: { lg: { colSpan: 4, order: 4 } } } },
+                        { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 5 } } } },
+                    ],
+                },
+                update: {
+                    sections: [{ id: 'basic-info' }],
+                    properties: [
+                        { name: 'code', layout: { positions: { lg: { colSpan: 4, order: 1 } } } },
+                        { name: 'title', layout: { positions: { lg: { colSpan: 8, order: 2 } } } },
+                        { name: 'effectivenessLevel', layout: { positions: { lg: { colSpan: 4, order: 3 } } } },
+                        { name: 'order', layout: { positions: { lg: { colSpan: 4, order: 4 } } } },
+                        { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 5 } } } },
+                    ],
+                },
+                single: {
+                    title: '{{ title }}',
+                    sections: [{ id: 'basic-info', 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: 'effectivenessLevel', layout: { positions: { lg: { colSpan: 4, order: 3 } } } },
+                        { name: 'order', layout: { positions: { lg: { colSpan: 4, order: 4 } } } },
+                        { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 5 } } } },
+                    ],
+                    actions: [...entityMasterRecordActions()],
+                },
+                list: {
+                    actions: [...entityMasterCrudActions()],
+                    views: [createAllQueryView({ sorts: [{ name: 'order', dir: 'asc' }, { name: 'code', dir: 'asc' }] })],
+                },
+            },
+        },
+    };
+    return entityDef;
+}
+//#endregion
+
+//#region ----   Imports   ----
+//#endregion
+
+var index$6 = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    controlMeasureTypeEntityFactory: controlMeasureTypeEntityFactory
+});
+
+//#endregion
+//#region ----   Constants   ----
+const listSortAndFilterOptions$5 = {
     sort: { enabled: true },
     filter: { advance: { enabled: true }, inline: { enabled: true } },
 };
@@ -502,6 +791,23 @@ async function hazardEntityFactory() {
             },
         ],
         relatedEntities: [
+            {
+                entity: `${RootConfig.module.name}.${RootConfig.entities.hazardRisk.name}`,
+                title: RootConfig.entities.hazardRisk.titlePlural,
+                icon: RootConfig.entities.hazardRisk.icon,
+                conditions: [entityDetailsSimpleCondition('hazardId')],
+                excludeProperties: ['hazardId'],
+                columns: [
+                    { name: 'code' },
+                    { name: 'title' },
+                    { name: 'riskMatrixId' },
+                    { name: 'defaultInitialRiskRatingId' },
+                    { name: 'defaultResidualRiskRatingId' },
+                    { name: 'sortOrder' },
+                ],
+                actions: [...entityDetailsCrudActions('hazardId')],
+                layout: { type: 'page-list', position: 'after', order: 11 },
+            },
             {
                 entity: `${RootConfig.module.name}.${RootConfig.entities.hazardPpeRule.name}`,
                 title: RootConfig.entities.hazardPpeRule.titlePlural,
@@ -516,7 +822,7 @@ async function hazardEntityFactory() {
                     { name: 'sortOrder' },
                 ],
                 actions: [...entityDetailsCrudActions('hazardId')],
-                layout: { type: 'page-list', position: 'after', order: 11 },
+                layout: { type: 'page-list', position: 'after', order: 12 },
             },
         ],
         groups: [
@@ -540,7 +846,7 @@ async function hazardEntityFactory() {
                 name: 'code',
                 title: '@workplacesafety-management:hazards.entities.hazard.fields.code.title',
                 groupId: 'basic-info',
-                options: listSortAndFilterOptions$4,
+                options: listSortAndFilterOptions$5,
                 schema: {
                     dataType: 'string',
                     unique: { enabled: true },
@@ -558,7 +864,7 @@ async function hazardEntityFactory() {
                 name: 'title',
                 title: '@workplacesafety-management:hazards.entities.hazard.fields.title.title',
                 groupId: 'basic-info',
-                options: listSortAndFilterOptions$4,
+                options: listSortAndFilterOptions$5,
                 schema: {
                     dataType: 'string',
                     interface: {
@@ -593,7 +899,7 @@ async function hazardEntityFactory() {
                 name: 'templateId',
                 title: '@workplacesafety-management:hazards.entities.hazard.fields.template-id.title',
                 groupId: 'assessment-compliance',
-                options: listSortAndFilterOptions$4,
+                options: listSortAndFilterOptions$5,
                 schema: {
                     dataType: 'string',
                     nullable: true,
@@ -710,90 +1016,57 @@ async function hazardEntityFactory() {
 }
 //#endregion
 
-var hazard_entity = /*#__PURE__*/Object.freeze({
+var index$5 = /*#__PURE__*/Object.freeze({
     __proto__: null,
     hazardEntityFactory: hazardEntityFactory
 });
 
-//#region ----   Imports   ----
-//#endregion
-//#region ----   Enums   ----
-var AXMHazardRegisterContextType;
-(function (AXMHazardRegisterContextType) {
-    AXMHazardRegisterContextType["Asset"] = "asset";
-    AXMHazardRegisterContextType["Site"] = "site";
-    AXMHazardRegisterContextType["WorkOrder"] = "work-order";
-    AXMHazardRegisterContextType["Project"] = "project";
-})(AXMHazardRegisterContextType || (AXMHazardRegisterContextType = {}));
-//#endregion
-
-//#region ----   Imports   ----
 //#endregion
 //#region ----   Constants   ----
-const listSortAndFilterOptions$3 = {
+const listSortAndFilterOptions$4 = {
     sort: { enabled: true },
     filter: { advance: { enabled: true }, inline: { enabled: true } },
 };
-const hazardCategoryEntity = `${RootConfig.module.name}.${RootConfig.entities.hazard.name}Category`;
-const contextTypeDataSource = [
-    {
-        id: AXMHazardRegisterContextType.Asset,
-        title: '@workplacesafety-management:hazard-registers.entities.hazard-register.fields.context-type.options.asset',
-    },
-    {
-        id: AXMHazardRegisterContextType.Site,
-        title: '@workplacesafety-management:hazard-registers.entities.hazard-register.fields.context-type.options.site',
-    },
-    {
-        id: AXMHazardRegisterContextType.Project,
-        title: '@workplacesafety-management:hazard-registers.entities.hazard-register.fields.context-type.options.project',
-    },
-];
 //#endregion
 //#region ----   Entity factory   ----
-async function hazardRegisterEntityFactory() {
+async function hazardPpeRuleEntityFactory() {
     const entityDef = {
         module: RootConfig.module.name,
-        name: RootConfig.entities.hazardRegister.name,
-        title: RootConfig.entities.hazardRegister.title,
-        icon: RootConfig.entities.hazardRegister.icon,
+        name: RootConfig.entities.hazardPpeRule.name,
+        title: RootConfig.entities.hazardPpeRule.title,
+        icon: RootConfig.entities.hazardPpeRule.icon,
         formats: {
-            individual: RootConfig.entities.hazardRegister.title,
-            plural: RootConfig.entities.hazardRegister.titlePlural,
+            individual: RootConfig.entities.hazardPpeRule.title,
+            plural: RootConfig.entities.hazardPpeRule.titlePlural,
             searchResult: {
-                title: '{{ title }}',
-                description: '{{ code }}',
+                title: '{{ code }}',
+                description: '{{ ppeItem.title }}',
             },
         },
         plugins: [
-            { name: 'identifier', options: { field: 'code', rule: 'hazard-register-code' } },
+            { name: 'identifier', options: { field: 'code', rule: 'hazard-ppe-rule-code' } },
             { name: 'unique-fields', options: { fields: 'code', scope: 'global' } },
             {
-                name: 'meta-data-form',
+                name: 'status',
                 options: {
-                    path: 'hazardId',
-                    mergeCategoryPath: 'registerType',
-                    title: '@workplacesafety-management:hazard-registers.entities.hazard-register.components.hazard-meta-data-form.title',
-                    display: {
-                        section: {
-                            order: 20,
-                        },
-                    },
+                    field: 'status',
+                    definition: 'workplacesafety-management.status.hazard-ppe-rule',
+                    order: 1,
                 },
             },
         ],
         groups: [
             {
                 id: 'basic-info',
-                title: '@workplacesafety-management:hazard-registers.entities.hazard-register.groups.basic-info',
+                title: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.groups.basic-info',
             },
             {
-                id: 'hazard-link',
-                title: '@workplacesafety-management:hazard-registers.entities.hazard-register.groups.hazard-link',
+                id: 'requirements',
+                title: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.groups.requirements',
             },
             {
-                id: 'context',
-                title: '@workplacesafety-management:hazard-registers.entities.hazard-register.groups.context',
+                id: 'notes',
+                title: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.groups.notes',
             },
         ],
         properties: [
@@ -805,9 +1078,9 @@ async function hazardRegisterEntityFactory() {
             },
             {
                 name: 'code',
-                title: '@workplacesafety-management:hazard-registers.entities.hazard-register.fields.code.title',
+                title: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.fields.code.title',
                 groupId: 'basic-info',
-                options: listSortAndFilterOptions$3,
+                options: listSortAndFilterOptions$4,
                 schema: {
                     dataType: 'string',
                     unique: { enabled: true },
@@ -815,125 +1088,159 @@ async function hazardRegisterEntityFactory() {
                         type: AXPWidgetsList.Editors.TextBox,
                         options: {
                             disabled: true,
-                            placeholder: '@workplacesafety-management:hazard-registers.entities.hazard-register.fields.code.placeholder',
+                            placeholder: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.fields.code.placeholder',
                         },
                     },
                 },
                 validations: [{ rule: 'required' }],
             },
             {
-                name: 'title',
-                title: '@workplacesafety-management:hazard-registers.entities.hazard-register.fields.title.title',
+                name: 'hazardId',
+                title: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.fields.hazard-id.title',
                 groupId: 'basic-info',
-                options: listSortAndFilterOptions$3,
+                options: listSortAndFilterOptions$4,
                 schema: {
                     dataType: 'string',
                     interface: {
-                        type: AXPWidgetsList.Editors.TextBox,
+                        type: AXPWidgetsList.Editors.LookupBox,
                         options: {
-                            placeholder: '@workplacesafety-management:hazard-registers.entities.hazard-register.fields.title.placeholder',
+                            look: 'select',
+                            entity: `${RootConfig.module.name}.${RootConfig.entities.hazard.name}`,
+                            textField: 'title',
+                            valueField: 'id',
+                            columns: ['code', 'title'],
+                            expose: [
+                                { source: 'id', target: 'hazard.id' },
+                                { source: 'title', target: 'hazard.title' },
+                                { source: 'code', target: 'hazard.code' },
+                            ],
                         },
                     },
                 },
                 validations: [{ rule: 'required' }],
             },
             {
-                name: 'description',
-                title: '@general:terms.common.description',
+                name: 'ppeItemId',
+                title: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.fields.ppe-item-id.title',
                 groupId: 'basic-info',
-                options: {
-                    sort: { enabled: false },
-                    filter: { advance: { enabled: true }, inline: { enabled: false } },
-                },
+                options: listSortAndFilterOptions$4,
                 schema: {
                     dataType: 'string',
-                    nullable: true,
                     interface: {
-                        type: AXPWidgetsList.Editors.LargeTextBox,
+                        type: AXPWidgetsList.Editors.LookupBox,
                         options: {
-                            rows: 3,
-                            placeholder: '@workplacesafety-management:hazard-registers.entities.hazard-register.fields.description.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: 'registerType',
-                title: '@workplacesafety-management:hazard-registers.entities.hazard-register.fields.register-type.title',
+                name: 'sortOrder',
+                title: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.fields.sort-order.title',
                 groupId: 'basic-info',
-                options: listSortAndFilterOptions$3,
+                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,
                 schema: {
                     dataType: 'string',
                     interface: {
-                        type: AXPWidgetsList.Editors.LookupBox,
+                        type: AXPWidgetsList.Editors.SelectBox,
                         options: {
-                            look: 'select',
-                            entity: hazardCategoryEntity,
-                            textField: 'title',
                             valueField: 'id',
-                            columns: ['code', 'title'],
-                            expose: [
-                                { source: 'id', target: 'registerTypeCategory.id' },
-                                { source: 'title', target: 'registerTypeCategory.title' },
-                                { source: 'code', target: 'registerTypeCategory.code' },
-                            ],
+                            textField: 'title',
+                            dataSource: [...WORKPLACE_SAFETY_HAZARD_PPE_RULE_REQUIREMENT_TYPE_OPTIONS],
                         },
                     },
                 },
+                validations: [{ rule: 'required' }],
             },
             {
-                name: 'hazardId',
-                title: '@workplacesafety-management:hazard-registers.entities.hazard-register.fields.hazard-id.title',
-                groupId: 'hazard-link',
-                options: listSortAndFilterOptions$3,
+                name: 'riskRatingIdWithPpe',
+                title: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.fields.risk-rating-id-with-ppe.title',
+                groupId: 'requirements',
+                options: listSortAndFilterOptions$4,
                 schema: {
                     dataType: 'string',
+                    nullable: true,
                     interface: {
                         type: AXPWidgetsList.Editors.LookupBox,
                         options: {
                             look: 'select',
-                            entity: `${RootConfig.module.name}.${RootConfig.entities.hazard.name}`,
+                            entity: `${RootConfig.module.name}.${RootConfig.entities.riskRating.name}`,
                             textField: 'title',
                             valueField: 'id',
                             columns: ['code', 'title'],
+                            hasClearButton: true,
                             expose: [
-                                { source: 'id', target: 'hazard.id' },
-                                { source: 'title', target: 'hazard.title' },
-                                { source: 'code', target: 'hazard.code' },
+                                { source: 'id', target: 'riskRatingWithPpe.id' },
+                                { source: 'title', target: 'riskRatingWithPpe.title' },
+                                { source: 'code', target: 'riskRatingWithPpe.code' },
                             ],
                         },
                     },
                 },
-                validations: [{ rule: 'required' }],
             },
             {
-                name: 'contextType',
-                title: '@workplacesafety-management:hazard-registers.entities.hazard-register.fields.context-type.title',
-                groupId: 'context',
-                options: listSortAndFilterOptions$3,
+                name: 'conditionNote',
+                title: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.fields.condition-note.title',
+                groupId: 'notes',
+                options: {
+                    sort: { enabled: false },
+                    filter: { advance: { enabled: true }, inline: { enabled: false } },
+                },
                 schema: {
                     dataType: 'string',
+                    nullable: true,
                     interface: {
-                        type: AXPWidgetsList.Editors.SelectBox,
+                        type: AXPWidgetsList.Editors.LargeTextBox,
                         options: {
-                            valueField: 'id',
-                            textField: 'title',
-                            dataSource: contextTypeDataSource,
+                            rows: 2,
+                            placeholder: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.fields.condition-note.placeholder',
                         },
                     },
                 },
             },
             {
-                name: 'contextId',
-                title: '@workplacesafety-management:hazard-registers.entities.hazard-register.fields.context-id.title',
-                groupId: 'context',
-                options: listSortAndFilterOptions$3,
+                name: 'usageInstruction',
+                title: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.fields.usage-instruction.title',
+                groupId: 'notes',
+                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:hazard-registers.entities.hazard-register.fields.context-id.placeholder',
+                            rows: 2,
+                            placeholder: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.fields.usage-instruction.placeholder',
                         },
                     },
                 },
@@ -941,46 +1248,61 @@ async function hazardRegisterEntityFactory() {
         ],
         columns: [
             { name: 'code', options: { width: '120px', order: 1 } },
-            { name: 'title', options: { width: '200px', order: 2 } },
-            { name: 'hazardId', options: { dataPath: 'hazard.title', order: 4 } },
+            { 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 } },
         ],
         interfaces: {
             master: {
                 create: {
-                    sections: [{ id: 'basic-info' }, { id: 'hazard-link' }, { id: 'context' }],
+                    sections: [{ id: 'basic-info' }, { id: 'requirements' }, { id: 'notes' }],
                     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: 4 } } } },
-                        { name: 'hazardId', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
+                        { 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: 'requirementType', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
+                        { name: 'riskRatingIdWithPpe', 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: 'hazard-link' }, { id: 'context' }],
+                    sections: [{ id: 'basic-info' }, { id: 'requirements' }, { id: 'notes' }],
                     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: 4 } } } },
-                        { name: 'hazardId', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
+                        { 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: 'requirementType', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
+                        { name: 'riskRatingIdWithPpe', 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 } } } },
                     ],
                 },
                 single: {
-                    title: '{{ title }}',
+                    title: '{{ code }}',
                     sections: [
                         { id: 'basic-info', layout: { positions: { lg: { colSpan: 12 } } } },
-                        { id: 'hazard-link', layout: { positions: { lg: { colSpan: 12 } } } },
+                        { id: 'requirements', layout: { positions: { lg: { colSpan: 12 } } } },
+                        { id: 'notes', 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: 4 } } } },
-                        { name: 'hazardId', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
+                        { 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: 'requirementType', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
+                        { name: 'riskRatingIdWithPpe', 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 } } } },
                     ],
                     actions: [...entityMasterRecordActions()],
                 },
                 list: {
                     actions: [...entityMasterCrudActions()],
-                    views: [createAllQueryView({ sorts: [{ name: 'code', dir: 'asc' }] })],
+                    views: [createAllQueryView({ sorts: [{ name: 'sortOrder', dir: 'asc' }, { name: 'code', dir: 'asc' }] })],
                 },
             },
         },
@@ -989,38 +1311,89 @@ async function hazardRegisterEntityFactory() {
 }
 //#endregion
 
-var hazardRegister_entity = /*#__PURE__*/Object.freeze({
+var index$4 = /*#__PURE__*/Object.freeze({
     __proto__: null,
-    hazardRegisterEntityFactory: hazardRegisterEntityFactory
+    hazardPpeRuleEntityFactory: hazardPpeRuleEntityFactory
 });
 
 //#region ----   Imports   ----
+//#endregion
+//#region ----   Enums   ----
+var AXMHazardRegisterContextType;
+(function (AXMHazardRegisterContextType) {
+    AXMHazardRegisterContextType["Asset"] = "asset";
+    AXMHazardRegisterContextType["Site"] = "site";
+    AXMHazardRegisterContextType["WorkOrder"] = "work-order";
+    AXMHazardRegisterContextType["Project"] = "project";
+})(AXMHazardRegisterContextType || (AXMHazardRegisterContextType = {}));
+//#endregion
+
 //#endregion
 //#region ----   Constants   ----
-const listSortAndFilterOptions$2 = {
+const listSortAndFilterOptions$3 = {
     sort: { enabled: true },
     filter: { advance: { enabled: true }, inline: { enabled: true } },
 };
+const hazardCategoryEntity = `${RootConfig.module.name}.${RootConfig.entities.hazard.name}Category`;
+const contextTypeDataSource = [
+    {
+        id: AXMHazardRegisterContextType.Asset,
+        title: '@workplacesafety-management:hazard-registers.entities.hazard-register.fields.context-type.options.asset',
+    },
+    {
+        id: AXMHazardRegisterContextType.Site,
+        title: '@workplacesafety-management:hazard-registers.entities.hazard-register.fields.context-type.options.site',
+    },
+    {
+        id: AXMHazardRegisterContextType.Project,
+        title: '@workplacesafety-management:hazard-registers.entities.hazard-register.fields.context-type.options.project',
+    },
+];
 //#endregion
 //#region ----   Entity factory   ----
-async function riskRatingEntityFactory() {
+async function hazardRegisterEntityFactory() {
     const entityDef = {
         module: RootConfig.module.name,
-        name: RootConfig.entities.riskRating.name,
-        title: RootConfig.entities.riskRating.title,
-        icon: RootConfig.entities.riskRating.icon,
+        name: RootConfig.entities.hazardRegister.name,
+        title: RootConfig.entities.hazardRegister.title,
+        icon: RootConfig.entities.hazardRegister.icon,
         formats: {
-            individual: RootConfig.entities.riskRating.title,
-            plural: RootConfig.entities.riskRating.titlePlural,
+            individual: RootConfig.entities.hazardRegister.title,
+            plural: RootConfig.entities.hazardRegister.titlePlural,
             searchResult: {
                 title: '{{ title }}',
                 description: '{{ code }}',
             },
         },
+        plugins: [
+            { name: 'identifier', options: { field: 'code', rule: 'hazard-register-code' } },
+            { name: 'unique-fields', options: { fields: 'code', scope: 'global' } },
+            {
+                name: 'meta-data-form',
+                options: {
+                    path: 'hazardId',
+                    mergeCategoryPath: 'registerType',
+                    title: '@workplacesafety-management:hazard-registers.entities.hazard-register.components.hazard-meta-data-form.title',
+                    display: {
+                        section: {
+                            order: 20,
+                        },
+                    },
+                },
+            },
+        ],
         groups: [
             {
                 id: 'basic-info',
-                title: '@workplacesafety-management:risk-ratings.entities.risk-rating.groups.basic-info',
+                title: '@workplacesafety-management:hazard-registers.entities.hazard-register.groups.basic-info',
+            },
+            {
+                id: 'hazard-link',
+                title: '@workplacesafety-management:hazard-registers.entities.hazard-register.groups.hazard-link',
+            },
+            {
+                id: 'context',
+                title: '@workplacesafety-management:hazard-registers.entities.hazard-register.groups.context',
             },
         ],
         properties: [
@@ -1032,16 +1405,17 @@ async function riskRatingEntityFactory() {
             },
             {
                 name: 'code',
-                title: '@workplacesafety-management:risk-ratings.entities.risk-rating.fields.code.title',
+                title: '@workplacesafety-management:hazard-registers.entities.hazard-register.fields.code.title',
                 groupId: 'basic-info',
-                options: listSortAndFilterOptions$2,
+                options: listSortAndFilterOptions$3,
                 schema: {
                     dataType: 'string',
                     unique: { enabled: true },
                     interface: {
                         type: AXPWidgetsList.Editors.TextBox,
                         options: {
-                            placeholder: '@workplacesafety-management:risk-ratings.entities.risk-rating.fields.code.placeholder',
+                            disabled: true,
+                            placeholder: '@workplacesafety-management:hazard-registers.entities.hazard-register.fields.code.placeholder',
                         },
                     },
                 },
@@ -1049,97 +1423,164 @@ async function riskRatingEntityFactory() {
             },
             {
                 name: 'title',
-                title: '@workplacesafety-management:risk-ratings.entities.risk-rating.fields.title.title',
+                title: '@workplacesafety-management:hazard-registers.entities.hazard-register.fields.title.title',
                 groupId: 'basic-info',
-                options: listSortAndFilterOptions$2,
+                options: listSortAndFilterOptions$3,
                 schema: {
                     dataType: 'string',
                     interface: {
                         type: AXPWidgetsList.Editors.TextBox,
                         options: {
-                            placeholder: '@workplacesafety-management:risk-ratings.entities.risk-rating.fields.title.placeholder',
+                            placeholder: '@workplacesafety-management:hazard-registers.entities.hazard-register.fields.title.placeholder',
                         },
                     },
                 },
                 validations: [{ rule: 'required' }],
             },
             {
-                name: 'levelNumber',
-                title: '@workplacesafety-management:risk-ratings.entities.risk-rating.fields.level-number.title',
+                name: 'description',
+                title: '@general:terms.common.description',
                 groupId: 'basic-info',
-                options: listSortAndFilterOptions$2,
-                schema: {
-                    dataType: 'number',
+                options: {
+                    sort: { enabled: false },
+                    filter: { advance: { enabled: true }, inline: { enabled: false } },
+                },
+                schema: {
+                    dataType: 'string',
+                    nullable: true,
                     interface: {
-                        type: AXPWidgetsList.Editors.NumberBox,
+                        type: AXPWidgetsList.Editors.LargeTextBox,
                         options: {
-                            minValue: 1,
-                            placeholder: '@workplacesafety-management:risk-ratings.entities.risk-rating.fields.level-number.placeholder',
+                            rows: 3,
+                            placeholder: '@workplacesafety-management:hazard-registers.entities.hazard-register.fields.description.placeholder',
                         },
                     },
                 },
-                validations: [{ rule: 'required' }],
             },
             {
-                name: 'description',
-                title: '@general:terms.common.description',
+                name: 'registerType',
+                title: '@workplacesafety-management:hazard-registers.entities.hazard-register.fields.register-type.title',
                 groupId: 'basic-info',
-                options: {
-                    sort: { enabled: false },
-                    filter: { advance: { enabled: true }, inline: { enabled: false } },
+                options: listSortAndFilterOptions$3,
+                schema: {
+                    dataType: 'string',
+                    interface: {
+                        type: AXPWidgetsList.Editors.LookupBox,
+                        options: {
+                            look: 'select',
+                            entity: hazardCategoryEntity,
+                            textField: 'title',
+                            valueField: 'id',
+                            columns: ['code', 'title'],
+                            expose: [
+                                { source: 'id', target: 'registerTypeCategory.id' },
+                                { source: 'title', target: 'registerTypeCategory.title' },
+                                { source: 'code', target: 'registerTypeCategory.code' },
+                            ],
+                        },
+                    },
                 },
+            },
+            {
+                name: 'hazardId',
+                title: '@workplacesafety-management:hazard-registers.entities.hazard-register.fields.hazard-id.title',
+                groupId: 'hazard-link',
+                options: listSortAndFilterOptions$3,
                 schema: {
                     dataType: 'string',
-                    nullable: true,
                     interface: {
-                        type: AXPWidgetsList.Editors.LargeTextBox,
+                        type: AXPWidgetsList.Editors.LookupBox,
                         options: {
-                            rows: 3,
-                            placeholder: '@workplacesafety-management:risk-ratings.entities.risk-rating.fields.description.placeholder',
+                            look: 'select',
+                            entity: `${RootConfig.module.name}.${RootConfig.entities.hazard.name}`,
+                            textField: 'title',
+                            valueField: 'id',
+                            columns: ['code', 'title'],
+                            expose: [
+                                { source: 'id', target: 'hazard.id' },
+                                { source: 'title', target: 'hazard.title' },
+                                { source: 'code', target: 'hazard.code' },
+                            ],
+                        },
+                    },
+                },
+                validations: [{ rule: 'required' }],
+            },
+            {
+                name: 'contextType',
+                title: '@workplacesafety-management:hazard-registers.entities.hazard-register.fields.context-type.title',
+                groupId: 'context',
+                options: listSortAndFilterOptions$3,
+                schema: {
+                    dataType: 'string',
+                    interface: {
+                        type: AXPWidgetsList.Editors.SelectBox,
+                        options: {
+                            valueField: 'id',
+                            textField: 'title',
+                            dataSource: contextTypeDataSource,
+                        },
+                    },
+                },
+            },
+            {
+                name: 'contextId',
+                title: '@workplacesafety-management:hazard-registers.entities.hazard-register.fields.context-id.title',
+                groupId: 'context',
+                options: listSortAndFilterOptions$3,
+                schema: {
+                    dataType: 'string',
+                    interface: {
+                        type: AXPWidgetsList.Editors.TextBox,
+                        options: {
+                            placeholder: '@workplacesafety-management:hazard-registers.entities.hazard-register.fields.context-id.placeholder',
                         },
                     },
                 },
             },
         ],
         columns: [
-            { name: 'levelNumber', options: { width: '100px', order: 1 } },
-            { name: 'code', options: { width: '120px', order: 2 } },
-            { name: 'title', options: { width: '220px', order: 3 } },
+            { name: 'code', options: { width: '120px', order: 1 } },
+            { name: 'title', options: { width: '200px', order: 2 } },
+            { name: 'hazardId', options: { dataPath: 'hazard.title', order: 4 } },
         ],
         interfaces: {
             master: {
                 create: {
-                    sections: [{ id: 'basic-info' }],
+                    sections: [{ id: 'basic-info' }, { id: 'hazard-link' }, { id: 'context' }],
                     properties: [
-                        { name: 'code', layout: { positions: { lg: { colSpan: 4, order: 1 } } } },
-                        { name: 'title', layout: { positions: { lg: { colSpan: 8, order: 2 } } } },
-                        { name: 'levelNumber', layout: { positions: { lg: { colSpan: 4, order: 3 } } } },
+                        { 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: 4 } } } },
+                        { name: 'hazardId', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
                     ],
                 },
                 update: {
-                    sections: [{ id: 'basic-info' }],
+                    sections: [{ id: 'basic-info' }, { id: 'hazard-link' }, { id: 'context' }],
                     properties: [
-                        { name: 'code', layout: { positions: { lg: { colSpan: 4, order: 1 } } } },
-                        { name: 'title', layout: { positions: { lg: { colSpan: 8, order: 2 } } } },
-                        { name: 'levelNumber', layout: { positions: { lg: { colSpan: 4, order: 3 } } } },
+                        { 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: 4 } } } },
+                        { name: 'hazardId', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
                     ],
                 },
                 single: {
                     title: '{{ title }}',
-                    sections: [{ id: 'basic-info', layout: { positions: { lg: { colSpan: 12 } } } }],
+                    sections: [
+                        { id: 'basic-info', layout: { positions: { lg: { colSpan: 12 } } } },
+                        { id: 'hazard-link', 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: 'levelNumber', layout: { positions: { lg: { colSpan: 4, order: 3 } } } },
+                        { 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: 4 } } } },
+                        { name: 'hazardId', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
                     ],
                     actions: [...entityMasterRecordActions()],
                 },
                 list: {
                     actions: [...entityMasterCrudActions()],
-                    views: [createAllQueryView({ sorts: [{ name: 'levelNumber', dir: 'asc' }] })],
+                    views: [createAllQueryView({ sorts: [{ name: 'code', dir: 'asc' }] })],
                 },
             },
         },
@@ -1148,67 +1589,67 @@ async function riskRatingEntityFactory() {
 }
 //#endregion
 
-var riskRating_entity = /*#__PURE__*/Object.freeze({
+var index$3 = /*#__PURE__*/Object.freeze({
     __proto__: null,
-    riskRatingEntityFactory: riskRatingEntityFactory
+    get AXMHazardRegisterContextType () { return AXMHazardRegisterContextType; },
+    hazardRegisterEntityFactory: hazardRegisterEntityFactory
 });
 
-//#region ----   Imports   ----
-//#endregion
-
 //#region ----   Imports   ----
 //#endregion
 //#region ----   Constants   ----
-const listSortAndFilterOptions$1 = {
+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 ppeItemEntityFactory() {
+async function hazardRiskEntityFactory() {
     const entityDef = {
         module: RootConfig.module.name,
-        name: RootConfig.entities.ppeItem.name,
-        title: RootConfig.entities.ppeItem.title,
-        icon: RootConfig.entities.ppeItem.icon,
+        name: RootConfig.entities.hazardRisk.name,
+        title: RootConfig.entities.hazardRisk.title,
+        icon: RootConfig.entities.hazardRisk.icon,
         formats: {
-            individual: RootConfig.entities.ppeItem.title,
-            plural: RootConfig.entities.ppeItem.titlePlural,
+            individual: RootConfig.entities.hazardRisk.title,
+            plural: RootConfig.entities.hazardRisk.titlePlural,
             searchResult: {
                 title: '{{ title }}',
                 description: '{{ code }}',
             },
         },
         plugins: [
-            { name: 'identifier', options: { field: 'code', rule: 'ppe-item-code' } },
+            { name: 'identifier', options: { field: 'code', rule: 'hazard-risk-code' } },
             { name: 'unique-fields', options: { fields: 'code', scope: 'global' } },
             {
                 name: 'status',
                 options: {
                     field: 'status',
-                    definition: 'workplacesafety-management.status.ppe-item',
+                    definition: 'workplacesafety-management.status.hazard-risk',
                     order: 1,
                 },
             },
-            {
-                name: 'category',
-                options: {
-                    appearance: { icon: true, color: true },
-                },
-            },
         ],
         groups: [
             {
                 id: 'basic-info',
-                title: '@workplacesafety-management:ppe-items.entities.ppe-item.groups.basic-info',
+                title: '@workplacesafety-management:hazard-risks.entities.hazard-risk.groups.basic-info',
+            },
+            {
+                id: 'risk-assessment',
+                title: '@workplacesafety-management:hazard-risks.entities.hazard-risk.groups.risk-assessment',
             },
             {
                 id: 'compliance',
-                title: '@workplacesafety-management:ppe-items.entities.ppe-item.groups.compliance',
+                title: '@workplacesafety-management:hazard-risks.entities.hazard-risk.groups.compliance',
             },
             {
-                id: 'appearance',
-                title: '@general:terms.interface.appearance',
+                id: 'notes',
+                title: '@workplacesafety-management:hazard-risks.entities.hazard-risk.groups.notes',
             },
         ],
         properties: [
@@ -1220,9 +1661,9 @@ async function ppeItemEntityFactory() {
             },
             {
                 name: 'code',
-                title: '@workplacesafety-management:ppe-items.entities.ppe-item.fields.code.title',
+                title: '@workplacesafety-management:hazard-risks.entities.hazard-risk.fields.code.title',
                 groupId: 'basic-info',
-                options: listSortAndFilterOptions$1,
+                options: listSortAndFilterOptions$2,
                 schema: {
                     dataType: 'string',
                     unique: { enabled: true },
@@ -1230,7 +1671,7 @@ async function ppeItemEntityFactory() {
                         type: AXPWidgetsList.Editors.TextBox,
                         options: {
                             disabled: true,
-                            placeholder: '@workplacesafety-management:ppe-items.entities.ppe-item.fields.code.placeholder',
+                            placeholder: '@workplacesafety-management:hazard-risks.entities.hazard-risk.fields.code.placeholder',
                         },
                     },
                 },
@@ -1238,15 +1679,15 @@ async function ppeItemEntityFactory() {
             },
             {
                 name: 'title',
-                title: '@workplacesafety-management:ppe-items.entities.ppe-item.fields.title.title',
+                title: '@workplacesafety-management:hazard-risks.entities.hazard-risk.fields.title.title',
                 groupId: 'basic-info',
-                options: listSortAndFilterOptions$1,
+                options: listSortAndFilterOptions$2,
                 schema: {
                     dataType: 'string',
                     interface: {
                         type: AXPWidgetsList.Editors.TextBox,
                         options: {
-                            placeholder: '@workplacesafety-management:ppe-items.entities.ppe-item.fields.title.placeholder',
+                            placeholder: '@workplacesafety-management:hazard-risks.entities.hazard-risk.fields.title.placeholder',
                         },
                     },
                 },
@@ -1254,127 +1695,286 @@ async function ppeItemEntityFactory() {
             },
             {
                 name: 'description',
-                title: '@general:terms.common.description',
+                title: '@workplacesafety-management:hazard-risks.entities.hazard-risk.fields.description.title',
                 groupId: 'basic-info',
-                options: {
-                    sort: { enabled: false },
-                    filter: { advance: { enabled: true }, inline: { enabled: false } },
-                },
+                options: noteFieldOptions,
                 schema: {
                     dataType: 'string',
                     nullable: true,
                     interface: {
                         type: AXPWidgetsList.Editors.LargeTextBox,
                         options: {
-                            rows: 3,
-                            placeholder: '@workplacesafety-management:ppe-items.entities.ppe-item.fields.description.placeholder',
+                            rows: 2,
+                            placeholder: '@workplacesafety-management:hazard-risks.entities.hazard-risk.fields.description.placeholder',
                         },
                     },
                 },
             },
             {
-                name: 'standardCode',
-                title: '@workplacesafety-management:ppe-items.entities.ppe-item.fields.standard-code.title',
-                groupId: 'compliance',
-                options: listSortAndFilterOptions$1,
+                name: 'hazardId',
+                title: '@workplacesafety-management:hazard-risks.entities.hazard-risk.fields.hazard-id.title',
+                groupId: 'basic-info',
+                options: listSortAndFilterOptions$2,
                 schema: {
                     dataType: 'string',
-                    nullable: true,
                     interface: {
-                        type: AXPWidgetsList.Editors.TextBox,
+                        type: AXPWidgetsList.Editors.LookupBox,
                         options: {
-                            placeholder: '@workplacesafety-management:ppe-items.entities.ppe-item.fields.standard-code.placeholder',
+                            look: 'select',
+                            entity: `${RootConfig.module.name}.${RootConfig.entities.hazard.name}`,
+                            textField: 'title',
+                            valueField: 'id',
+                            columns: ['code', 'title'],
+                            expose: [
+                                { source: 'id', target: 'hazard.id' },
+                                { source: 'title', target: 'hazard.title' },
+                                { source: 'code', target: 'hazard.code' },
+                            ],
                         },
                     },
                 },
+                validations: [{ rule: 'required' }],
             },
             {
-                name: 'usageNote',
-                title: '@workplacesafety-management:ppe-items.entities.ppe-item.fields.usage-note.title',
-                groupId: 'compliance',
-                options: listSortAndFilterOptions$1,
+                name: 'riskMatrixId',
+                title: '@workplacesafety-management:hazard-risks.entities.hazard-risk.fields.risk-matrix-id.title',
+                groupId: 'basic-info',
+                options: listSortAndFilterOptions$2,
                 schema: {
                     dataType: 'string',
-                    nullable: true,
                     interface: {
-                        type: AXPWidgetsList.Editors.TextBox,
+                        type: AXPWidgetsList.Editors.LookupBox,
                         options: {
-                            placeholder: '@workplacesafety-management:ppe-items.entities.ppe-item.fields.usage-note.placeholder',
+                            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' },
+                            ],
                         },
                     },
                 },
+                validations: [{ rule: 'required' }],
             },
             {
-                name: 'icon',
-                title: '@workplacesafety-management:ppe-items.entities.ppe-item.fields.icon.title',
-                groupId: 'appearance',
-                options: {
-                    sort: { enabled: false },
-                    filter: { advance: { enabled: false }, inline: { enabled: false } },
+                name: 'sortOrder',
+                title: '@workplacesafety-management:hazard-risks.entities.hazard-risk.fields.sort-order.title',
+                groupId: 'basic-info',
+                options: listSortAndFilterOptions$2,
+                schema: {
+                    dataType: 'number',
+                    nullable: true,
+                    interface: {
+                        type: AXPWidgetsList.Editors.NumberBox,
+                        options: {
+                            minValue: 0,
+                            placeholder: '@workplacesafety-management:hazard-risks.entities.hazard-risk.fields.sort-order.placeholder',
+                        },
+                    },
                 },
+            },
+            {
+                name: 'defaultInitialRiskRatingId',
+                title: '@workplacesafety-management:hazard-risks.entities.hazard-risk.fields.default-initial-risk-rating-id.title',
+                groupId: 'risk-assessment',
+                options: listSortAndFilterOptions$2,
                 schema: {
                     dataType: 'string',
                     nullable: true,
                     interface: {
-                        type: AXPWidgetsList.Advanced.Image,
+                        type: AXPWidgetsList.Editors.LookupBox,
                         options: {
-                            type: 'profile-photo',
+                            look: 'select',
+                            entity: `${RootConfig.module.name}.${RootConfig.entities.riskRating.name}`,
+                            textField: 'title',
+                            valueField: 'id',
+                            columns: ['code', 'title'],
+                            hasClearButton: true,
+                            expose: [
+                                { source: 'id', target: 'defaultInitialRiskRating.id' },
+                                { source: 'title', target: 'defaultInitialRiskRating.title' },
+                                { source: 'code', target: 'defaultInitialRiskRating.code' },
+                            ],
                         },
                     },
                 },
             },
-        ],
-        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 } },
-        ],
-        interfaces: {
-            master: {
-                create: {
-                    sections: [{ id: 'basic-info' }, { id: 'compliance' }, { id: 'appearance' }],
+            {
+                name: 'defaultResidualRiskRatingId',
+                title: '@workplacesafety-management:hazard-risks.entities.hazard-risk.fields.default-residual-risk-rating-id.title',
+                groupId: 'risk-assessment',
+                options: listSortAndFilterOptions$2,
+                schema: {
+                    dataType: 'string',
+                    nullable: true,
+                    interface: {
+                        type: AXPWidgetsList.Editors.LookupBox,
+                        options: {
+                            look: 'select',
+                            entity: `${RootConfig.module.name}.${RootConfig.entities.riskRating.name}`,
+                            textField: 'title',
+                            valueField: 'id',
+                            columns: ['code', 'title'],
+                            hasClearButton: true,
+                            expose: [
+                                { source: 'id', target: 'defaultResidualRiskRating.id' },
+                                { source: 'title', target: 'defaultResidualRiskRating.title' },
+                                { source: 'code', target: 'defaultResidualRiskRating.code' },
+                            ],
+                        },
+                    },
+                },
+            },
+            {
+                name: 'responsibleRoleText',
+                title: '@workplacesafety-management:hazard-risks.entities.hazard-risk.fields.responsible-role-text.title',
+                groupId: 'compliance',
+                options: noteFieldOptions,
+                schema: {
+                    dataType: 'string',
+                    nullable: true,
+                    interface: {
+                        type: AXPWidgetsList.Editors.LargeTextBox,
+                        options: {
+                            rows: 2,
+                            placeholder: '@workplacesafety-management:hazard-risks.entities.hazard-risk.fields.responsible-role-text.placeholder',
+                        },
+                    },
+                },
+            },
+            {
+                name: 'legislationText',
+                title: '@workplacesafety-management:hazard-risks.entities.hazard-risk.fields.legislation-text.title',
+                groupId: 'compliance',
+                options: noteFieldOptions,
+                schema: {
+                    dataType: 'string',
+                    nullable: true,
+                    interface: {
+                        type: AXPWidgetsList.Editors.LargeTextBox,
+                        options: {
+                            rows: 2,
+                            placeholder: '@workplacesafety-management:hazard-risks.entities.hazard-risk.fields.legislation-text.placeholder',
+                        },
+                    },
+                },
+            },
+            {
+                name: 'conditionNote',
+                title: '@workplacesafety-management:hazard-risks.entities.hazard-risk.fields.condition-note.title',
+                groupId: 'notes',
+                options: noteFieldOptions,
+                schema: {
+                    dataType: 'string',
+                    nullable: true,
+                    interface: {
+                        type: AXPWidgetsList.Editors.LargeTextBox,
+                        options: {
+                            rows: 2,
+                            placeholder: '@workplacesafety-management:hazard-risks.entities.hazard-risk.fields.condition-note.placeholder',
+                        },
+                    },
+                },
+            },
+            {
+                name: 'assessmentInstruction',
+                title: '@workplacesafety-management:hazard-risks.entities.hazard-risk.fields.assessment-instruction.title',
+                groupId: 'notes',
+                options: noteFieldOptions,
+                schema: {
+                    dataType: 'string',
+                    nullable: true,
+                    interface: {
+                        type: AXPWidgetsList.Editors.LargeTextBox,
+                        options: {
+                            rows: 3,
+                            placeholder: '@workplacesafety-management:hazard-risks.entities.hazard-risk.fields.assessment-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 } },
+        ],
+        interfaces: {
+            master: {
+                create: {
+                    sections: [{ id: 'basic-info' }, { id: 'risk-assessment' }, { id: 'compliance' }, { id: 'notes' }],
                     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: '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: 'responsibleRoleText', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
+                        { name: 'legislationText', layout: { positions: { lg: { colSpan: 12, order: 2 } } } },
+                        { name: 'conditionNote', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
+                        { name: 'assessmentInstruction', layout: { positions: { lg: { colSpan: 12, order: 2 } } } },
                     ],
                 },
                 update: {
-                    sections: [{ id: 'basic-info' }, { id: 'compliance' }, { id: 'appearance' }],
+                    sections: [{ id: 'basic-info' }, { id: 'risk-assessment' }, { id: 'compliance' }, { id: 'notes' }],
                     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: '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: 'responsibleRoleText', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
+                        { name: 'legislationText', layout: { positions: { lg: { colSpan: 12, order: 2 } } } },
+                        { name: 'conditionNote', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
+                        { name: 'assessmentInstruction', layout: { positions: { lg: { colSpan: 12, order: 2 } } } },
                     ],
                 },
                 single: {
                     title: '{{ title }}',
                     sections: [
                         { id: 'basic-info', layout: { positions: { lg: { colSpan: 12 } } } },
+                        { id: 'risk-assessment', layout: { positions: { lg: { colSpan: 12 } } } },
                         { id: 'compliance', layout: { positions: { lg: { colSpan: 12 } } } },
-                        { id: 'appearance', layout: { positions: { lg: { colSpan: 12 } } } },
+                        { id: 'notes', 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: '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: '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: 'responsibleRoleText', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
+                        { name: 'legislationText', layout: { positions: { lg: { colSpan: 12, order: 2 } } } },
+                        { name: 'conditionNote', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
+                        { name: 'assessmentInstruction', layout: { positions: { lg: { colSpan: 12, order: 2 } } } },
                     ],
                     actions: [...entityMasterRecordActions()],
                 },
                 list: {
                     actions: [...entityMasterCrudActions()],
-                    views: [createAllQueryView({ sorts: [{ name: 'code', dir: 'asc' }] })],
+                    views: [createAllQueryView({ sorts: [{ name: 'sortOrder', dir: 'asc' }, { name: 'code', dir: 'asc' }] })],
                 },
             },
         },
@@ -1383,89 +1983,66 @@ async function ppeItemEntityFactory() {
 }
 //#endregion
 
-var ppeItem_entity = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    ppeItemEntityFactory: ppeItemEntityFactory
-});
-
 //#region ----   Imports   ----
 //#endregion
 
-//#region ----   Imports   ----
-//#endregion
-//#region ----   Enums   ----
-var AXMHazardPpeRuleRequirementType;
-(function (AXMHazardPpeRuleRequirementType) {
-    AXMHazardPpeRuleRequirementType["Required"] = "required";
-    AXMHazardPpeRuleRequirementType["Recommended"] = "recommended";
-    AXMHazardPpeRuleRequirementType["Conditional"] = "conditional";
-})(AXMHazardPpeRuleRequirementType || (AXMHazardPpeRuleRequirementType = {}));
-//#endregion
-
-//#region ----   Hazard PPE rule requirement type options   ----
-const WORKPLACE_SAFETY_HAZARD_PPE_RULE_REQUIREMENT_TYPE_OPTIONS = [
-    {
-        id: AXMHazardPpeRuleRequirementType.Required,
-        title: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.fields.requirement-type.options.required',
-    },
-    {
-        id: AXMHazardPpeRuleRequirementType.Recommended,
-        title: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.fields.requirement-type.options.recommended',
-    },
-    {
-        id: AXMHazardPpeRuleRequirementType.Conditional,
-        title: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.fields.requirement-type.options.conditional',
-    },
-];
-//#endregion
+var index$2 = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    hazardRiskEntityFactory: hazardRiskEntityFactory
+});
 
-//#region ----   Imports   ----
 //#endregion
 //#region ----   Constants   ----
-const listSortAndFilterOptions = {
+const listSortAndFilterOptions$1 = {
     sort: { enabled: true },
     filter: { advance: { enabled: true }, inline: { enabled: true } },
 };
 //#endregion
 //#region ----   Entity factory   ----
-async function hazardPpeRuleEntityFactory() {
+async function ppeItemEntityFactory() {
     const entityDef = {
         module: RootConfig.module.name,
-        name: RootConfig.entities.hazardPpeRule.name,
-        title: RootConfig.entities.hazardPpeRule.title,
-        icon: RootConfig.entities.hazardPpeRule.icon,
+        name: RootConfig.entities.ppeItem.name,
+        title: RootConfig.entities.ppeItem.title,
+        icon: RootConfig.entities.ppeItem.icon,
         formats: {
-            individual: RootConfig.entities.hazardPpeRule.title,
-            plural: RootConfig.entities.hazardPpeRule.titlePlural,
+            individual: RootConfig.entities.ppeItem.title,
+            plural: RootConfig.entities.ppeItem.titlePlural,
             searchResult: {
-                title: '{{ code }}',
-                description: '{{ ppeItem.title }}',
+                title: '{{ title }}',
+                description: '{{ code }}',
             },
         },
         plugins: [
-            { name: 'identifier', options: { field: 'code', rule: 'hazard-ppe-rule-code' } },
+            { name: 'identifier', options: { field: 'code', rule: 'ppe-item-code' } },
             { name: 'unique-fields', options: { fields: 'code', scope: 'global' } },
             {
                 name: 'status',
                 options: {
                     field: 'status',
-                    definition: 'workplacesafety-management.status.hazard-ppe-rule',
+                    definition: 'workplacesafety-management.status.ppe-item',
                     order: 1,
                 },
             },
+            {
+                name: 'category',
+                options: {
+                    appearance: { icon: true, color: true },
+                },
+            },
         ],
         groups: [
             {
                 id: 'basic-info',
-                title: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.groups.basic-info',
+                title: '@workplacesafety-management:ppe-items.entities.ppe-item.groups.basic-info',
             },
             {
-                id: 'requirements',
-                title: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.groups.requirements',
+                id: 'compliance',
+                title: '@workplacesafety-management:ppe-items.entities.ppe-item.groups.compliance',
             },
             {
-                id: 'notes',
-                title: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.groups.notes',
+                id: 'appearance',
+                title: '@general:terms.interface.appearance',
             },
         ],
         properties: [
@@ -1477,9 +2054,9 @@ async function hazardPpeRuleEntityFactory() {
             },
             {
                 name: 'code',
-                title: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.fields.code.title',
+                title: '@workplacesafety-management:ppe-items.entities.ppe-item.fields.code.title',
                 groupId: 'basic-info',
-                options: listSortAndFilterOptions,
+                options: listSortAndFilterOptions$1,
                 schema: {
                     dataType: 'string',
                     unique: { enabled: true },
@@ -1487,147 +2064,255 @@ async function hazardPpeRuleEntityFactory() {
                         type: AXPWidgetsList.Editors.TextBox,
                         options: {
                             disabled: true,
-                            placeholder: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.fields.code.placeholder',
+                            placeholder: '@workplacesafety-management:ppe-items.entities.ppe-item.fields.code.placeholder',
                         },
                     },
                 },
                 validations: [{ rule: 'required' }],
             },
             {
-                name: 'hazardId',
-                title: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.fields.hazard-id.title',
+                name: 'title',
+                title: '@workplacesafety-management:ppe-items.entities.ppe-item.fields.title.title',
                 groupId: 'basic-info',
-                options: listSortAndFilterOptions,
+                options: listSortAndFilterOptions$1,
                 schema: {
                     dataType: 'string',
                     interface: {
-                        type: AXPWidgetsList.Editors.LookupBox,
+                        type: AXPWidgetsList.Editors.TextBox,
                         options: {
-                            look: 'select',
-                            entity: `${RootConfig.module.name}.${RootConfig.entities.hazard.name}`,
-                            textField: 'title',
-                            valueField: 'id',
-                            columns: ['code', 'title'],
-                            expose: [
-                                { source: 'id', target: 'hazard.id' },
-                                { source: 'title', target: 'hazard.title' },
-                                { source: 'code', target: 'hazard.code' },
-                            ],
+                            placeholder: '@workplacesafety-management:ppe-items.entities.ppe-item.fields.title.placeholder',
                         },
                     },
                 },
                 validations: [{ rule: 'required' }],
             },
             {
-                name: 'ppeItemId',
-                title: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.fields.ppe-item-id.title',
+                name: 'description',
+                title: '@general:terms.common.description',
                 groupId: 'basic-info',
-                options: listSortAndFilterOptions,
+                options: {
+                    sort: { enabled: false },
+                    filter: { advance: { enabled: true }, inline: { enabled: false } },
+                },
                 schema: {
                     dataType: 'string',
+                    nullable: true,
                     interface: {
-                        type: AXPWidgetsList.Editors.LookupBox,
+                        type: AXPWidgetsList.Editors.LargeTextBox,
                         options: {
-                            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' },
-                            ],
+                            rows: 3,
+                            placeholder: '@workplacesafety-management:ppe-items.entities.ppe-item.fields.description.placeholder',
                         },
                     },
                 },
-                validations: [{ rule: 'required' }],
             },
             {
-                name: 'sortOrder',
-                title: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.fields.sort-order.title',
-                groupId: 'basic-info',
-                options: listSortAndFilterOptions,
+                name: 'standardCode',
+                title: '@workplacesafety-management:ppe-items.entities.ppe-item.fields.standard-code.title',
+                groupId: 'compliance',
+                options: listSortAndFilterOptions$1,
                 schema: {
-                    dataType: 'number',
+                    dataType: 'string',
                     nullable: true,
                     interface: {
-                        type: AXPWidgetsList.Editors.NumberBox,
+                        type: AXPWidgetsList.Editors.TextBox,
                         options: {
-                            minValue: 0,
-                            placeholder: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.fields.sort-order.placeholder',
+                            placeholder: '@workplacesafety-management:ppe-items.entities.ppe-item.fields.standard-code.placeholder',
                         },
                     },
                 },
             },
             {
-                name: 'requirementType',
-                title: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.fields.requirement-type.title',
-                groupId: 'requirements',
-                options: listSortAndFilterOptions,
+                name: 'usageNote',
+                title: '@workplacesafety-management:ppe-items.entities.ppe-item.fields.usage-note.title',
+                groupId: 'compliance',
+                options: listSortAndFilterOptions$1,
                 schema: {
                     dataType: 'string',
+                    nullable: true,
                     interface: {
-                        type: AXPWidgetsList.Editors.SelectBox,
+                        type: AXPWidgetsList.Editors.TextBox,
                         options: {
-                            valueField: 'id',
-                            textField: 'title',
-                            dataSource: [...WORKPLACE_SAFETY_HAZARD_PPE_RULE_REQUIREMENT_TYPE_OPTIONS],
+                            placeholder: '@workplacesafety-management:ppe-items.entities.ppe-item.fields.usage-note.placeholder',
                         },
                     },
                 },
-                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,
+                name: 'icon',
+                title: '@workplacesafety-management:ppe-items.entities.ppe-item.fields.icon.title',
+                groupId: 'appearance',
+                options: {
+                    sort: { enabled: false },
+                    filter: { advance: { enabled: false }, inline: { enabled: false } },
+                },
                 schema: {
                     dataType: 'string',
                     nullable: true,
                     interface: {
-                        type: AXPWidgetsList.Editors.LookupBox,
+                        type: AXPWidgetsList.Advanced.Image,
                         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' },
-                            ],
+                            type: 'profile-photo',
                         },
                     },
                 },
             },
+        ],
+        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 } },
+        ],
+        interfaces: {
+            master: {
+                create: {
+                    sections: [{ id: 'basic-info' }, { id: 'compliance' }, { id: 'appearance' }],
+                    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 } } } },
+                    ],
+                },
+                update: {
+                    sections: [{ id: 'basic-info' }, { id: 'compliance' }, { id: 'appearance' }],
+                    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 } } } },
+                    ],
+                },
+                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 } } } },
+                    ],
+                    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 } } } },
+                    ],
+                    actions: [...entityMasterRecordActions()],
+                },
+                list: {
+                    actions: [...entityMasterCrudActions()],
+                    views: [createAllQueryView({ sorts: [{ name: 'code', dir: 'asc' }] })],
+                },
+            },
+        },
+    };
+    return entityDef;
+}
+//#endregion
+
+//#endregion
+
+var index$1 = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    ppeItemEntityFactory: ppeItemEntityFactory
+});
+
+//#endregion
+//#region ----   Constants   ----
+const listSortAndFilterOptions = {
+    sort: { enabled: true },
+    filter: { advance: { enabled: true }, inline: { enabled: true } },
+};
+//#endregion
+//#region ----   Entity factory   ----
+async function riskRatingEntityFactory() {
+    const entityDef = {
+        module: RootConfig.module.name,
+        name: RootConfig.entities.riskRating.name,
+        title: RootConfig.entities.riskRating.title,
+        icon: RootConfig.entities.riskRating.icon,
+        formats: {
+            individual: RootConfig.entities.riskRating.title,
+            plural: RootConfig.entities.riskRating.titlePlural,
+            searchResult: {
+                title: '{{ title }}',
+                description: '{{ code }}',
+            },
+        },
+        groups: [
             {
-                name: 'conditionNote',
-                title: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.fields.condition-note.title',
-                groupId: 'notes',
-                options: {
-                    sort: { enabled: false },
-                    filter: { advance: { enabled: true }, inline: { enabled: false } },
+                id: 'basic-info',
+                title: '@workplacesafety-management:risk-ratings.entities.risk-rating.groups.basic-info',
+            },
+        ],
+        properties: [
+            {
+                name: 'id',
+                title: '@general:terms.common.id',
+                groupId: 'basic-info',
+                schema: { dataType: 'uuid', visible: false, nullable: false, readonly: true, unique: { enabled: true } },
+            },
+            {
+                name: 'code',
+                title: '@workplacesafety-management:risk-ratings.entities.risk-rating.fields.code.title',
+                groupId: 'basic-info',
+                options: listSortAndFilterOptions,
+                schema: {
+                    dataType: 'string',
+                    unique: { enabled: true },
+                    interface: {
+                        type: AXPWidgetsList.Editors.TextBox,
+                        options: {
+                            placeholder: '@workplacesafety-management:risk-ratings.entities.risk-rating.fields.code.placeholder',
+                        },
+                    },
                 },
+                validations: [{ rule: 'required' }],
+            },
+            {
+                name: 'title',
+                title: '@workplacesafety-management:risk-ratings.entities.risk-rating.fields.title.title',
+                groupId: 'basic-info',
+                options: listSortAndFilterOptions,
                 schema: {
                     dataType: 'string',
-                    nullable: true,
                     interface: {
-                        type: AXPWidgetsList.Editors.LargeTextBox,
+                        type: AXPWidgetsList.Editors.TextBox,
                         options: {
-                            rows: 2,
-                            placeholder: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.fields.condition-note.placeholder',
+                            placeholder: '@workplacesafety-management:risk-ratings.entities.risk-rating.fields.title.placeholder',
                         },
                     },
                 },
+                validations: [{ rule: 'required' }],
             },
             {
-                name: 'usageInstruction',
-                title: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.fields.usage-instruction.title',
-                groupId: 'notes',
+                name: 'levelNumber',
+                title: '@workplacesafety-management:risk-ratings.entities.risk-rating.fields.level-number.title',
+                groupId: 'basic-info',
+                options: listSortAndFilterOptions,
+                schema: {
+                    dataType: 'number',
+                    interface: {
+                        type: AXPWidgetsList.Editors.NumberBox,
+                        options: {
+                            minValue: 1,
+                            placeholder: '@workplacesafety-management:risk-ratings.entities.risk-rating.fields.level-number.placeholder',
+                        },
+                    },
+                },
+                validations: [{ rule: 'required' }],
+            },
+            {
+                name: 'description',
+                title: '@general:terms.common.description',
+                groupId: 'basic-info',
                 options: {
                     sort: { enabled: false },
                     filter: { advance: { enabled: true }, inline: { enabled: false } },
@@ -1638,70 +2323,52 @@ async function hazardPpeRuleEntityFactory() {
                     interface: {
                         type: AXPWidgetsList.Editors.LargeTextBox,
                         options: {
-                            rows: 2,
-                            placeholder: '@workplacesafety-management:hazard-ppe-rules.entities.hazard-ppe-rule.fields.usage-instruction.placeholder',
+                            rows: 3,
+                            placeholder: '@workplacesafety-management:risk-ratings.entities.risk-rating.fields.description.placeholder',
                         },
                     },
                 },
             },
         ],
         columns: [
-            { 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: 'levelNumber', options: { width: '100px', order: 1 } },
+            { name: 'code', options: { width: '120px', order: 2 } },
+            { name: 'title', options: { width: '220px', order: 3 } },
         ],
         interfaces: {
             master: {
                 create: {
-                    sections: [{ id: 'basic-info' }, { id: 'requirements' }, { id: 'notes' }],
+                    sections: [{ id: 'basic-info' }],
                     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: 'requirementType', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
-                        { name: 'riskRatingIdWithPpe', 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 } } } },
+                        { name: 'title', layout: { positions: { lg: { colSpan: 8, order: 2 } } } },
+                        { name: 'levelNumber', layout: { positions: { lg: { colSpan: 4, order: 3 } } } },
+                        { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 4 } } } },
                     ],
                 },
                 update: {
-                    sections: [{ id: 'basic-info' }, { id: 'requirements' }, { id: 'notes' }],
+                    sections: [{ id: 'basic-info' }],
                     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: 'requirementType', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
-                        { name: 'riskRatingIdWithPpe', 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 } } } },
+                        { name: 'title', layout: { positions: { lg: { colSpan: 8, order: 2 } } } },
+                        { name: 'levelNumber', layout: { positions: { lg: { colSpan: 4, order: 3 } } } },
+                        { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 4 } } } },
                     ],
                 },
                 single: {
-                    title: '{{ code }}',
-                    sections: [
-                        { id: 'basic-info', layout: { positions: { lg: { colSpan: 12 } } } },
-                        { id: 'requirements', layout: { positions: { lg: { colSpan: 12 } } } },
-                        { id: 'notes', layout: { positions: { lg: { colSpan: 12 } } } },
-                    ],
+                    title: '{{ title }}',
+                    sections: [{ id: 'basic-info', 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: 'requirementType', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
-                        { name: 'riskRatingIdWithPpe', 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 } } } },
+                        { name: 'title', layout: { positions: { lg: { colSpan: 8, order: 2 } } } },
+                        { name: 'levelNumber', layout: { positions: { lg: { colSpan: 4, order: 3 } } } },
+                        { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 4 } } } },
                     ],
                     actions: [...entityMasterRecordActions()],
                 },
                 list: {
                     actions: [...entityMasterCrudActions()],
-                    views: [createAllQueryView({ sorts: [{ name: 'sortOrder', dir: 'asc' }, { name: 'code', dir: 'asc' }] })],
+                    views: [createAllQueryView({ sorts: [{ name: 'levelNumber', dir: 'asc' }] })],
                 },
             },
         },
@@ -1710,17 +2377,16 @@ async function hazardPpeRuleEntityFactory() {
 }
 //#endregion
 
-var hazardPpeRule_entity = /*#__PURE__*/Object.freeze({
+//#endregion
+
+var index = /*#__PURE__*/Object.freeze({
     __proto__: null,
-    hazardPpeRuleEntityFactory: hazardPpeRuleEntityFactory
+    riskRatingEntityFactory: riskRatingEntityFactory
 });
 
-//#region ---- Contracts barrel ----
-//#endregion
-
 /**
  * Generated bundle index. Do not edit.
  */
 
-export { AXMHazardPpeRuleRequirementType, AXMHazardRegisterContextType, AXMWorkplaceSafetyManagementEntityProvider, AXMWorkplaceSafetyManagementMenuProvider, AXMWorkplaceSafetyManagementModule, AXMWorkplaceSafetyManagementPermissionKeys, AXMWorkplaceSafetyManagementSearchCommandProvider, RootConfig, hazardEntityFactory, hazardPpeRuleEntityFactory, hazardRegisterEntityFactory, 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, controlMeasureTypeEntityFactory, hazardEntityFactory, hazardPpeRuleEntityFactory, hazardRegisterEntityFactory, hazardRiskEntityFactory, ppeItemEntityFactory, riskRatingEntityFactory };
 //# sourceMappingURL=acorex-modules-workplacesafety-management.mjs.map