@acorex/connectivity 20.3.0-next.2 → 20.3.0-next.4

package/fesm2022/acorex-connectivity-mock.mjs

@@ -248,7 +248,7 @@ class MockApplicationLoader {
         const demo_app = {
             id: '1',
             name: 'demo',
-            title: 'DEMO Application',
+            title: 'Safetyminder Application',
             version: '1.0.0',
             editionName: 'Standard',
         };
@@ -304,21 +304,10 @@ class MockPermissionLoader {
             AXMPermissionsKeys$1.Issue.MyReportedIssues.Management,
         ];
         this.adminPermissions = [...this.userPermissions, ...['admin', 'demo.admin.settings']];
-        this.rootPermissions = [
-            ...this.adminPermissions,
-            ...[
-                'platform',
-                'platform.reports',
-                'document-management:manage',
-                'document-management:document-type:manage',
-                'document-management:driver:manage',
-            ],
-            AXMPermissionsKeys$1.Issue.ReportedIssues.Management,
-        ];
     }
     getList(context) {
         if (context.user?.name == 'root') {
-            return of(this.rootPermissions);
+            return of();
         }
         else if (context.user?.name == 'admin') {
             return of(this.adminPermissions);
@@ -339,12 +328,12 @@ class MockTenantLoader {
         const acorex_tenant = {
             id: '99',
             name: 'acorex-tenant',
-            title: 'ACoreX Platform Tenant',
+            title: 'Platform Tenant',
         };
         const demo_tenant = {
             id: '1',
             name: 'demo-tenant',
-            title: 'DEMO Tenant',
+            title: 'Safetyminder Company',
         };
         // return of([demo_tenant]).pipe(delay(500));
         //  return of([acorex_tenant]).pipe(delay(500));
@@ -4508,7 +4497,7 @@ class AXCDataManagementMockModule {
             provideQuerySetups([
                 {
                     key: 'category-with-items',
-                    loader: () => import('./acorex-connectivity-mock-category-with-items.query-DXt3OWKg.mjs').then(m => m.AXCQueryCategoryWithItemsQuery),
+                    loader: () => import('./acorex-connectivity-mock-category-with-items.query-DEY9R9q2.mjs').then(m => m.AXCQueryCategoryWithItemsQuery),
                 }
             ])
         ] }); }
@@ -4533,7 +4522,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.8", ngImpor
                         provideQuerySetups([
                             {
                                 key: 'category-with-items',
-                                loader: () => import('./acorex-connectivity-mock-category-with-items.query-DXt3OWKg.mjs').then(m => m.AXCQueryCategoryWithItemsQuery),
+                                loader: () => import('./acorex-connectivity-mock-category-with-items.query-DEY9R9q2.mjs').then(m => m.AXCQueryCategoryWithItemsQuery),
                             }
                         ])
                     ],
@@ -6007,8 +5996,8 @@ class AXMFormDataSourcesProvider {
             title: 'Yes/No Options',
             columns: [
                 {
-                    name: 'value',
-                    title: 'Value',
+                    name: 'id',
+                    title: 'Title',
                     type: AXPWidgetsCatalog.text,
                     datatype: 'string',
                 },
@@ -6056,8 +6045,8 @@ class AXMFormDataSourcesProvider {
             title: 'Yes/No/N/A Options',
             columns: [
                 {
-                    name: 'value',
-                    title: 'Value',
+                    name: 'id',
+                    title: 'Title',
                     type: AXPWidgetsCatalog.text,
                     datatype: 'string',
                 },
@@ -6108,8 +6097,8 @@ class AXMFormDataSourcesProvider {
             title: 'Boolean Options',
             columns: [
                 {
-                    name: 'value',
-                    title: 'Value',
+                    name: 'id',
+                    title: 'Title',
                     type: AXPWidgetsCatalog.text,
                     datatype: 'boolean',
                 },
@@ -6157,8 +6146,8 @@ class AXMFormDataSourcesProvider {
             title: 'Weather Conditions',
             columns: [
                 {
-                    name: 'value',
-                    title: 'Value',
+                    name: 'id',
+                    title: 'Title',
                     type: AXPWidgetsCatalog.text,
                     datatype: 'string',
                 },
@@ -6215,8 +6204,8 @@ class AXMFormDataSourcesProvider {
             title: 'Visibility Levels',
             columns: [
                 {
-                    name: 'value',
-                    title: 'Value',
+                    name: 'id',
+                    title: 'Title',
                     type: AXPWidgetsCatalog.text,
                     datatype: 'string',
                 },
@@ -6270,8 +6259,8 @@ class AXMFormDataSourcesProvider {
             title: 'Work Areas',
             columns: [
                 {
-                    name: 'value',
-                    title: 'Value',
+                    name: 'id',
+                    title: 'Title',
                     type: AXPWidgetsCatalog.text,
                     datatype: 'string',
                 },
@@ -6331,8 +6320,8 @@ class AXMFormDataSourcesProvider {
             title: 'Departments',
             columns: [
                 {
-                    name: 'value',
-                    title: 'Value',
+                    name: 'id',
+                    title: 'Title',
                     type: AXPWidgetsCatalog.text,
                     datatype: 'string',
                 },
@@ -6395,8 +6384,8 @@ class AXMFormDataSourcesProvider {
             title: 'Permit Types',
             columns: [
                 {
-                    name: 'value',
-                    title: 'Value',
+                    name: 'id',
+                    title: 'Title',
                     type: AXPWidgetsCatalog.text,
                     datatype: 'string',
                 },
@@ -6461,8 +6450,8 @@ class AXMFormDataSourcesProvider {
             title: 'Approval Status',
             columns: [
                 {
-                    name: 'value',
-                    title: 'Value',
+                    name: 'id',
+                    title: 'Title',
                     type: AXPWidgetsCatalog.text,
                     datatype: 'string',
                 },
@@ -6513,8 +6502,8 @@ class AXMFormDataSourcesProvider {
             title: 'Work Completion Status',
             columns: [
                 {
-                    name: 'value',
-                    title: 'Value',
+                    name: 'id',
+                    title: 'Title',
                     type: AXPWidgetsCatalog.text,
                     datatype: 'string',
                 },
@@ -6565,8 +6554,8 @@ class AXMFormDataSourcesProvider {
             title: 'Training Status',
             columns: [
                 {
-                    name: 'value',
-                    title: 'Value',
+                    name: 'id',
+                    title: 'Title',
                     type: AXPWidgetsCatalog.text,
                     datatype: 'string',
                 },
@@ -6617,8 +6606,8 @@ class AXMFormDataSourcesProvider {
             title: 'Certification Status',
             columns: [
                 {
-                    name: 'value',
-                    title: 'Value',
+                    name: 'id',
+                    title: 'Title',
                     type: AXPWidgetsCatalog.text,
                     datatype: 'string',
                 },
@@ -6672,8 +6661,8 @@ class AXMFormDataSourcesProvider {
             title: 'Priority Levels',
             columns: [
                 {
-                    name: 'value',
-                    title: 'Value',
+                    name: 'id',
+                    title: 'Title',
                     type: AXPWidgetsCatalog.text,
                     datatype: 'string',
                 },
@@ -6727,8 +6716,8 @@ class AXMFormDataSourcesProvider {
             title: 'Incident Types',
             columns: [
                 {
-                    name: 'value',
-                    title: 'Value',
+                    name: 'id',
+                    title: 'Title',
                     type: AXPWidgetsCatalog.text,
                     datatype: 'string',
                 },
@@ -6788,8 +6777,8 @@ class AXMFormDataSourcesProvider {
             title: 'Severity Levels',
             columns: [
                 {
-                    name: 'value',
-                    title: 'Value',
+                    name: 'id',
+                    title: 'Title',
                     type: AXPWidgetsCatalog.text,
                     datatype: 'string',
                 },
@@ -7623,7 +7612,7 @@ var children$4 = [
 													readonly: false,
 													dataSource: "incident-types",
 													textField: "title",
-													valueField: "value"
+													valueField: "id"
 												}
 											}
 										],
@@ -7726,7 +7715,7 @@ var children$4 = [
 													readonly: false,
 													dataSource: "severity-levels",
 													textField: "title",
-													valueField: "value"
+													valueField: "id"
 												}
 											}
 										],
@@ -12005,6 +11994,235 @@ var children$3 = [
 								}
 							}
 						},
+						children: [
+							{
+								type: "flex-layout",
+								name: "flex-layout5",
+								children: [
+									{
+										type: "flex-layout",
+										name: "flex-layout5",
+										children: [
+											{
+												type: "flex-item-layout",
+												name: "flex-item-layout7",
+												options: {
+													multiple: false,
+													direction: "ltr",
+													disabled: false,
+													readonly: false,
+													dataSource: "booleans",
+													textField: "title",
+													valueField: "value",
+													spacing: {
+														margin: "0px 0px 0px 0px",
+														padding: "0px 0px 0px 0px"
+													},
+													border: {
+														width: "1px",
+														radius: "0px",
+														color: "#000000",
+														style: "none"
+													}
+												},
+												children: [
+													{
+														type: "selection-list-editor",
+														name: "selection-list-editor21",
+														path: "select-option-row-21",
+														options: {
+															multiple: false,
+															direction: {
+																id: "horizontal"
+															},
+															disabled: false,
+															readonly: false,
+															dataSource: "yes-no-options",
+															textField: "title",
+															valueField: "value"
+														}
+													}
+												]
+											}
+										],
+										options: {
+											spacing: {
+												margin: "0px",
+												padding: "0px"
+											},
+											border: {
+												width: "1px",
+												radius: "0px",
+												color: "#000000",
+												style: "none"
+											},
+											direction: "ltr",
+											flexWrap: "nowrap",
+											justifyContent: "center",
+											alignItems: "center",
+											gap: "20px"
+										}
+									}
+								],
+								options: {
+									spacing: {
+										margin: "0px",
+										padding: "0px"
+									},
+									border: {
+										width: "1px",
+										radius: "0px",
+										color: "#000000",
+										style: "none"
+									},
+									flexWrap: "nowrap",
+									justifyContent: "center",
+									alignItems: "center",
+									gap: "20px"
+								}
+							}
+						]
+					},
+					{
+						type: "grid-item-layout",
+						name: "grid-item-layout50",
+						options: {
+							spacing: {
+								margin: "0px",
+								padding: "10px"
+							},
+							border: {
+								width: "1px",
+								radius: "0px",
+								color: "#000000",
+								style: "solid"
+							},
+							direction: "ltr",
+							colSpan: 12,
+							grid: {
+								"default": {
+									rows: 1,
+									columns: 1,
+									justifyItems: "stretch",
+									alignItems: "stretch",
+									gap: "0px 0px"
+								}
+							},
+							backgroundColor: "rgb(0,166,244)"
+						},
+						children: [
+							{
+								type: "text-block-layout",
+								name: "text-block-layout7",
+								options: {
+									content: "<p>4. Control the Hazard(s) If you tick <span style=\"color:#ff0000\">NO</span>, complete a SWMS. </p>"
+								}
+							}
+						]
+					},
+					{
+						type: "grid-item-layout",
+						name: "grid-item-layout51",
+						options: {
+							spacing: {
+								margin: "0px 0px 0px 0px",
+								padding: "0px 0px 0px 0px"
+							},
+							border: {
+								width: "1px",
+								radius: "0px",
+								color: "#000000",
+								style: "none"
+							},
+							direction: "ltr",
+							colSpan: 10,
+							grid: {
+								"default": {
+									rows: 1,
+									columns: 1,
+									justifyItems: "stretch",
+									alignItems: "stretch",
+									gap: "0px 0px"
+								}
+							}
+						},
+						children: [
+							{
+								type: "flex-layout",
+								name: "flex-layout44",
+								children: [
+									{
+										type: "flex-item-layout",
+										name: "flex-item-layout46",
+										children: [
+											{
+												type: "text-block-layout",
+												name: "text-block-layout28",
+												options: {
+													content: "<p>SWMS Completed? </p>"
+												}
+											}
+										],
+										options: {
+											spacing: {
+												margin: "0px 0px 0px 0px",
+												padding: "0px 0px 0px 0px"
+											},
+											border: {
+												width: "1px",
+												radius: "0px",
+												color: "#000000",
+												style: "none"
+											},
+											direction: "ltr"
+										}
+									}
+								],
+								options: {
+									spacing: {
+										margin: "0px",
+										padding: "10px"
+									},
+									border: {
+										width: "1px",
+										radius: "0px",
+										color: "#000000",
+										style: "none"
+									},
+									flexWrap: "nowrap",
+									justifyContent: "center",
+									alignItems: "center",
+									gap: "20px"
+								}
+							}
+						]
+					},
+					{
+						type: "grid-item-layout",
+						name: "grid-item-layout52",
+						options: {
+							spacing: {
+								margin: "0px 0px 0px 0px",
+								padding: "0px 0px 0px 0px"
+							},
+							border: {
+								width: "1px",
+								radius: "0px",
+								color: "#000000",
+								style: "none"
+							},
+							direction: "ltr",
+							colSpan: 2,
+							grid: {
+								"default": {
+									rows: 1,
+									columns: 1,
+									justifyItems: "stretch",
+									alignItems: "stretch",
+									gap: "0px 0px"
+								}
+							}
+						},
 						children: [
 							{
 								type: "flex-layout",
@@ -12041,463 +12259,234 @@ var children$3 = [
 														type: "selection-list-editor",
 														name: "selection-list-editor19",
 														path: "select-option-row-19",
-														options: {
-															multiple: false,
-															direction: {
-																id: "horizontal"
-															},
-															disabled: false,
-															readonly: false,
-															dataSource: "yes-no-options",
-															textField: "title",
-															valueField: "value"
-														}
-													}
-												]
-											}
-										],
-										options: {
-											spacing: {
-												margin: "0px",
-												padding: "0px"
-											},
-											border: {
-												width: "1px",
-												radius: "0px",
-												color: "#000000",
-												style: "none"
-											},
-											direction: "ltr",
-											flexWrap: "nowrap",
-											justifyContent: "center",
-											alignItems: "center",
-											gap: "20px"
-										}
-									}
-								],
-								options: {
-									spacing: {
-										margin: "0px",
-										padding: "0px"
-									},
-									border: {
-										width: "1px",
-										radius: "0px",
-										color: "#000000",
-										style: "none"
-									},
-									flexWrap: "nowrap",
-									justifyContent: "center",
-									alignItems: "center",
-									gap: "20px"
-								}
-							}
-						]
-					},
-					{
-						type: "grid-item-layout",
-						name: "grid-item-layout50",
-						options: {
-							spacing: {
-								margin: "0px",
-								padding: "10px"
-							},
-							border: {
-								width: "1px",
-								radius: "0px",
-								color: "#000000",
-								style: "solid"
-							},
-							direction: "ltr",
-							colSpan: 12,
-							grid: {
-								"default": {
-									rows: 1,
-									columns: 1,
-									justifyItems: "stretch",
-									alignItems: "stretch",
-									gap: "0px 0px"
-								}
-							},
-							backgroundColor: "rgb(0,166,244)"
-						},
-						children: [
-							{
-								type: "text-block-layout",
-								name: "text-block-layout7",
-								options: {
-									content: "<p>4. Control the Hazard(s) If you tick <span style=\"color:#ff0000\">NO</span>, complete a SWMS. </p>"
-								}
-							}
-						]
-					},
-					{
-						type: "grid-item-layout",
-						name: "grid-item-layout51",
-						options: {
-							spacing: {
-								margin: "0px 0px 0px 0px",
-								padding: "0px 0px 0px 0px"
-							},
-							border: {
-								width: "1px",
-								radius: "0px",
-								color: "#000000",
-								style: "none"
-							},
-							direction: "ltr",
-							colSpan: 10,
-							grid: {
-								"default": {
-									rows: 1,
-									columns: 1,
-									justifyItems: "stretch",
-									alignItems: "stretch",
-									gap: "0px 0px"
-								}
-							}
-						},
-						children: [
-							{
-								type: "flex-layout",
-								name: "flex-layout44",
-								children: [
-									{
-										type: "flex-item-layout",
-										name: "flex-item-layout46",
-										children: [
-											{
-												type: "text-block-layout",
-												name: "text-block-layout28",
-												options: {
-													content: "<p>SWMS Completed? </p>"
-												}
-											}
-										],
-										options: {
-											spacing: {
-												margin: "0px 0px 0px 0px",
-												padding: "0px 0px 0px 0px"
-											},
-											border: {
-												width: "1px",
-												radius: "0px",
-												color: "#000000",
-												style: "none"
-											},
-											direction: "ltr"
-										}
-									}
-								],
-								options: {
-									spacing: {
-										margin: "0px",
-										padding: "10px"
-									},
-									border: {
-										width: "1px",
-										radius: "0px",
-										color: "#000000",
-										style: "none"
-									},
-									flexWrap: "nowrap",
-									justifyContent: "center",
-									alignItems: "center",
-									gap: "20px"
-								}
-							}
-						]
-					},
-					{
-						type: "grid-item-layout",
-						name: "grid-item-layout52",
-						options: {
-							spacing: {
-								margin: "0px 0px 0px 0px",
-								padding: "0px 0px 0px 0px"
-							},
-							border: {
-								width: "1px",
-								radius: "0px",
-								color: "#000000",
-								style: "none"
-							},
-							direction: "ltr",
-							colSpan: 2,
-							grid: {
-								"default": {
-									rows: 1,
-									columns: 1,
-									justifyItems: "stretch",
-									alignItems: "stretch",
-									gap: "0px 0px"
-								}
-							}
-						},
-						children: [
-							{
-								type: "flex-layout",
-								name: "flex-layout5",
-								children: [
-									{
-										type: "flex-layout",
-										name: "flex-layout5",
-										children: [
-											{
-												type: "flex-item-layout",
-												name: "flex-item-layout7",
-												options: {
-													multiple: false,
-													direction: "ltr",
-													disabled: false,
-													readonly: false,
-													dataSource: "booleans",
-													textField: "title",
-													valueField: "value",
-													spacing: {
-														margin: "0px 0px 0px 0px",
-														padding: "0px 0px 0px 0px"
-													},
-													border: {
-														width: "1px",
-														radius: "0px",
-														color: "#000000",
-														style: "none"
-													}
-												},
-												children: [
-													{
-														type: "selection-list-editor",
-														name: "selection-list-editor19",
-														path: "select-option-row-19",
-														options: {
-															multiple: false,
-															direction: {
-																id: "horizontal"
-															},
-															disabled: false,
-															readonly: false,
-															dataSource: "yes-no-options",
-															textField: "title",
-															valueField: "value"
-														}
-													}
-												]
-											}
-										],
-										options: {
-											spacing: {
-												margin: "0px",
-												padding: "0px"
-											},
-											border: {
-												width: "1px",
-												radius: "0px",
-												color: "#000000",
-												style: "none"
-											},
-											flexWrap: "nowrap",
-											justifyContent: "center",
-											alignItems: "center",
-											gap: "20px"
-										}
-									}
-								],
-								options: {
-									spacing: {
-										margin: "0px",
-										padding: "0px"
-									},
-									border: {
-										width: "1px",
-										radius: "0px",
-										color: "#000000",
-										style: "none"
-									},
-									flexWrap: "nowrap",
-									justifyContent: "center",
-									alignItems: "center",
-									gap: "20px"
-								}
-							}
-						]
-					},
-					{
-						type: "grid-item-layout",
-						name: "grid-item-layout53",
-						options: {
-							spacing: {
-								margin: "0px",
-								padding: "10px"
-							},
-							border: {
-								width: "1px",
-								radius: "0px",
-								color: "#000000",
-								style: "solid"
-							},
-							direction: "ltr",
-							colSpan: 12,
-							grid: {
-								"default": {
-									rows: 1,
-									columns: 1,
-									justifyItems: "stretch",
-									alignItems: "stretch",
-									gap: "0px 0px"
-								}
-							},
-							backgroundColor: "rgb(0,166,244)"
-						},
-						children: [
-							{
-								type: "text-block-layout",
-								name: "text-block-layout7",
-								options: {
-									content: "<p>5. Proceed Safely If you tick <span style=\"color:#ff0000\">NO</span>, complete a SWMS.</p>"
-								}
-							}
-						]
-					},
-					{
-						type: "grid-item-layout",
-						name: "grid-item-layout54",
-						options: {
-							spacing: {
-								margin: "0px 0px 0px 0px",
-								padding: "0px 0px 0px 0px"
-							},
-							border: {
-								width: "1px",
-								radius: "0px",
-								color: "#000000",
-								style: "none"
-							},
-							direction: "ltr",
-							colSpan: 10,
-							grid: {
-								"default": {
-									rows: 1,
-									columns: 1,
-									justifyItems: "stretch",
-									alignItems: "stretch",
-									gap: "0px 0px"
-								}
-							}
-						},
-						children: [
-							{
-								type: "flex-layout",
-								name: "flex-layout44",
-								children: [
-									{
-										type: "flex-item-layout",
-										name: "flex-item-layout46",
-										children: [
-											{
-												type: "text-block-layout",
-												name: "text-block-layout28",
-												options: {
-													content: "<p>Safe to Proceed? </p>"
-												}
-											}
-										],
-										options: {
-											spacing: {
-												margin: "0px 0px 0px 0px",
-												padding: "0px 0px 0px 0px"
-											},
-											border: {
-												width: "1px",
-												radius: "0px",
-												color: "#000000",
-												style: "none"
-											},
-											direction: "ltr"
-										}
-									}
-								],
-								options: {
-									spacing: {
-										margin: "0px",
-										padding: "10px"
-									},
-									border: {
-										width: "1px",
-										radius: "0px",
-										color: "#000000",
-										style: "none"
-									},
-									flexWrap: "nowrap",
-									justifyContent: "center",
-									alignItems: "center",
-									gap: "20px"
-								}
-							}
-						]
-					},
-					{
-						type: "grid-item-layout",
-						name: "grid-item-layout55",
-						options: {
-							spacing: {
-								margin: "0px 0px 0px 0px",
-								padding: "0px 0px 0px 0px"
-							},
-							border: {
-								width: "1px",
-								radius: "0px",
-								color: "#000000",
-								style: "none"
-							},
-							direction: "ltr",
-							colSpan: 2,
-							grid: {
-								"default": {
-									rows: 1,
-									columns: 1,
-									justifyItems: "stretch",
-									alignItems: "stretch",
-									gap: "0px 0px"
-								}
-							}
-						},
-						children: [
-							{
-								type: "flex-layout",
-								name: "flex-layout5",
-								children: [
-									{
-										type: "flex-layout",
-										name: "flex-layout5",
-										children: [
-											{
-												type: "flex-item-layout",
-												name: "flex-item-layout7",
-												options: {
-													multiple: false,
-													direction: "ltr",
-													disabled: false,
-													readonly: false,
-													dataSource: "booleans",
-													textField: "title",
-													valueField: "value",
-													spacing: {
-														margin: "0px 0px 0px 0px",
-														padding: "0px 0px 0px 0px"
-													},
-													border: {
-														width: "1px",
-														radius: "0px",
-														color: "#000000",
-														style: "none"
-													}
-												},
-												children: [
-													{
-														type: "selection-list-editor",
-														name: "selection-list-editor19",
-														path: "select-option-row-19",
+														options: {
+															multiple: false,
+															direction: {
+																id: "horizontal"
+															},
+															disabled: false,
+															readonly: false,
+															dataSource: "yes-no-options",
+															textField: "title",
+															valueField: "value"
+														}
+													}
+												]
+											}
+										],
+										options: {
+											spacing: {
+												margin: "0px",
+												padding: "0px"
+											},
+											border: {
+												width: "1px",
+												radius: "0px",
+												color: "#000000",
+												style: "none"
+											},
+											flexWrap: "nowrap",
+											justifyContent: "center",
+											alignItems: "center",
+											gap: "20px"
+										}
+									}
+								],
+								options: {
+									spacing: {
+										margin: "0px",
+										padding: "0px"
+									},
+									border: {
+										width: "1px",
+										radius: "0px",
+										color: "#000000",
+										style: "none"
+									},
+									flexWrap: "nowrap",
+									justifyContent: "center",
+									alignItems: "center",
+									gap: "20px"
+								}
+							}
+						]
+					},
+					{
+						type: "grid-item-layout",
+						name: "grid-item-layout53",
+						options: {
+							spacing: {
+								margin: "0px",
+								padding: "10px"
+							},
+							border: {
+								width: "1px",
+								radius: "0px",
+								color: "#000000",
+								style: "solid"
+							},
+							direction: "ltr",
+							colSpan: 12,
+							grid: {
+								"default": {
+									rows: 1,
+									columns: 1,
+									justifyItems: "stretch",
+									alignItems: "stretch",
+									gap: "0px 0px"
+								}
+							},
+							backgroundColor: "rgb(0,166,244)"
+						},
+						children: [
+							{
+								type: "text-block-layout",
+								name: "text-block-layout7",
+								options: {
+									content: "<p>5. Proceed Safely If you tick <span style=\"color:#ff0000\">NO</span>, complete a SWMS.</p>"
+								}
+							}
+						]
+					},
+					{
+						type: "grid-item-layout",
+						name: "grid-item-layout54",
+						options: {
+							spacing: {
+								margin: "0px 0px 0px 0px",
+								padding: "0px 0px 0px 0px"
+							},
+							border: {
+								width: "1px",
+								radius: "0px",
+								color: "#000000",
+								style: "none"
+							},
+							direction: "ltr",
+							colSpan: 10,
+							grid: {
+								"default": {
+									rows: 1,
+									columns: 1,
+									justifyItems: "stretch",
+									alignItems: "stretch",
+									gap: "0px 0px"
+								}
+							}
+						},
+						children: [
+							{
+								type: "flex-layout",
+								name: "flex-layout44",
+								children: [
+									{
+										type: "flex-item-layout",
+										name: "flex-item-layout46",
+										children: [
+											{
+												type: "text-block-layout",
+												name: "text-block-layout28",
+												options: {
+													content: "<p>Safe to Proceed? </p>"
+												}
+											}
+										],
+										options: {
+											spacing: {
+												margin: "0px 0px 0px 0px",
+												padding: "0px 0px 0px 0px"
+											},
+											border: {
+												width: "1px",
+												radius: "0px",
+												color: "#000000",
+												style: "none"
+											},
+											direction: "ltr"
+										}
+									}
+								],
+								options: {
+									spacing: {
+										margin: "0px",
+										padding: "10px"
+									},
+									border: {
+										width: "1px",
+										radius: "0px",
+										color: "#000000",
+										style: "none"
+									},
+									flexWrap: "nowrap",
+									justifyContent: "center",
+									alignItems: "center",
+									gap: "20px"
+								}
+							}
+						]
+					},
+					{
+						type: "grid-item-layout",
+						name: "grid-item-layout55",
+						options: {
+							spacing: {
+								margin: "0px 0px 0px 0px",
+								padding: "0px 0px 0px 0px"
+							},
+							border: {
+								width: "1px",
+								radius: "0px",
+								color: "#000000",
+								style: "none"
+							},
+							direction: "ltr",
+							colSpan: 2,
+							grid: {
+								"default": {
+									rows: 1,
+									columns: 1,
+									justifyItems: "stretch",
+									alignItems: "stretch",
+									gap: "0px 0px"
+								}
+							}
+						},
+						children: [
+							{
+								type: "flex-layout",
+								name: "flex-layout5",
+								children: [
+									{
+										type: "flex-layout",
+										name: "flex-layout5",
+										children: [
+											{
+												type: "flex-item-layout",
+												name: "flex-item-layout7",
+												options: {
+													multiple: false,
+													direction: "ltr",
+													disabled: false,
+													readonly: false,
+													dataSource: "booleans",
+													textField: "title",
+													valueField: "value",
+													spacing: {
+														margin: "0px 0px 0px 0px",
+														padding: "0px 0px 0px 0px"
+													},
+													border: {
+														width: "1px",
+														radius: "0px",
+														color: "#000000",
+														style: "none"
+													}
+												},
+												children: [
+													{
+														type: "selection-list-editor",
+														name: "selection-list-editor20",
+														path: "select-option-row-20",
 														options: {
 															multiple: false,
 															direction: {
@@ -14153,69 +14142,69 @@ var children = [
 		children: [
 			{
 				type: "grid-layout",
-				name: "header-grid",
+				name: "grid-layout1",
 				options: {
 					spacing: {
 						margin: "0px 0px 20px",
 						padding: "0px"
 					},
 					border: {
-						width: "2px",
-						radius: "8px",
-						color: "#dc2626",
+						width: "1px",
+						radius: "0px",
+						color: "#000000",
 						style: "solid"
 					},
 					grid: {
 						"default": {
 							rows: 1,
-							columns: 2,
+							columns: 3,
 							justifyItems: "stretch",
-							alignItems: "center",
-							gap: "20px"
+							alignItems: "stretch",
+							gap: "0px 0px"
 						}
 					}
 				},
 				children: [
 					{
 						type: "grid-item-layout",
-						name: "logo-section",
+						name: "grid-item-layout1",
 						children: [
 							{
 								type: "image",
-								name: "company-logo",
+								name: "image1",
 								options: {
 									lazy: false,
 									readonly: true,
 									src: "https://sm-demo.acorexui.com/assets/images/logos/icon-light.svg",
-									height: "80px",
-									width: "80px"
+									height: "100px",
+									width: "100px"
 								}
 							}
 						],
 						options: {
 							spacing: {
 								margin: "0px",
-								padding: "0px"
+								padding: "10px"
 							},
 							border: {
-								width: "0px",
+								width: "1px",
 								radius: "0px",
 								color: "#000000",
-								style: "none"
+								style: "solid"
 							},
 							direction: "ltr"
 						}
 					},
 					{
 						type: "grid-item-layout",
-						name: "title-section",
+						name: "grid-item-layout2",
 						options: {
 							spacing: {
-								margin: "0px",
-								padding: "20px"
+								margin: "0px 0px 0px 0px",
+								padding: "0px 0px 0px 0px"
 							},
 							border: {
-								width: "0px",
+								width: "1px",
 								radius: "0px",
 								color: "#000000",
 								style: "none"
@@ -14224,138 +14213,259 @@ var children = [
 						},
 						children: [
 							{
-								type: "text-block-layout",
-								name: "form-title",
+								type: "flex-layout",
+								name: "flex-layout1",
 								options: {
-									content: "<h2><strong style='color: #dc2626;'>PERMIT TO WORK</strong></h2>"
-								}
-							},
+									spacing: {
+										margin: "0px 0px 0px 0px",
+										padding: "0px 0px 0px 0px"
+									},
+									border: {
+										width: "1px",
+										radius: "0px",
+										color: "#000000",
+										style: "solid"
+									},
+									flexWrap: "nowrap",
+									justifyContent: "center",
+									alignItems: "center"
+								},
+								children: [
+									{
+										type: "flex-item-layout",
+										name: "flex-item-layout1",
+										options: {
+											spacing: {
+												margin: "0px 100px",
+												padding: "0px"
+											},
+											border: {
+												width: "1px",
+												radius: "0px",
+												color: "#000000",
+												style: "none"
+											},
+											direction: "ltr"
+										},
+										children: [
+											{
+												type: "text-block-layout",
+												name: "text-block-layout1",
+												options: {
+													content: "<p><strong>PERMIT TO WORK</strong></p>"
+												}
+											}
+										]
+									}
+								]
+							}
+						]
+					},
+					{
+						type: "grid-item-layout",
+						name: "grid-item-layout3",
+						children: [
 							{
-								type: "text-block-layout",
-								name: "form-subtitle",
+								type: "flex-layout",
+								name: "flex-layout2",
+								children: [
+									{
+										type: "flex-item-layout",
+										name: "flex-item-layout2",
+										options: {
+											spacing: {
+												margin: "0px",
+												padding: "30px"
+											},
+											border: {
+												width: "1px",
+												radius: "0px",
+												color: "#000000",
+												style: "none"
+											},
+											direction: "ltr",
+											flexWrap: "nowrap",
+											justifyContent: "flex-start",
+											alignItems: "flex-start"
+										},
+										children: [
+											{
+												type: "text-block-layout",
+												name: "text-block-layout2",
+												options: {
+													content: "<p>Hazardous Work Activity Authorization<br/>⚠️ This permit must be completed before work begins</p>"
+												}
+											}
+										]
+									}
+								],
 								options: {
-									content: "<p><strong>Hazardous Work Activity Authorization</strong></p>"
+									spacing: {
+										margin: "0px 0px 0px 0px",
+										padding: "0px 0px 0px 0px"
+									},
+									border: {
+										width: "1px",
+										radius: "0px",
+										color: "#000000",
+										style: "none"
+									},
+									flexWrap: "nowrap",
+									justifyContent: "center",
+									alignItems: "center",
+									flexDirection: "row"
 								}
+							}
+						],
+						options: {
+							spacing: {
+								margin: "0px 0px 0px 0px",
+								padding: "0px 0px 0px 0px"
 							},
-							{
-								type: "text-block-layout",
-								name: "warning-text",
-								options: {
-									content: "<p style='color: #dc2626;'><strong>⚠️ This permit must be completed before work begins</strong></p>"
+							border: {
+								width: "1px",
+								radius: "0px",
+								color: "#000000",
+								style: "solid"
+							},
+							direction: "ltr",
+							grid: {
+								"default": {
+									rows: 1,
+									columns: 1,
+									justifyItems: "stretch",
+									alignItems: "stretch",
+									gap: "0px 0px"
 								}
 							}
-						]
+						}
 					}
 				]
 			},
 			{
 				type: "grid-layout",
-				name: "permit-details-grid",
+				name: "grid-layout2",
 				options: {
 					grid: {
 						"default": {
 							columns: 12,
 							rows: 1,
-							gap: "20px",
+							gap: "0px 0px",
 							justifyItems: "stretch",
 							alignItems: "stretch"
 						}
 					},
 					spacing: {
-						margin: "0px 0px 30px",
+						margin: "0px",
 						padding: "0px"
 					},
 					border: {
-						width: "0px",
+						width: "1px",
 						radius: "0px",
 						color: "#000000",
-						style: "none"
+						style: "solid"
 					}
 				},
 				children: [
 					{
 						type: "grid-item-layout",
-						name: "permit-info",
+						name: "grid-item-layout4",
 						options: {
 							spacing: {
-								margin: "0px",
-								padding: "20px"
+								margin: "0px 0px 0px 0px",
+								padding: "0px 0px 0px 0px"
 							},
 							border: {
 								width: "1px",
-								radius: "8px",
-								color: "#e5e7eb",
-								style: "solid"
+								radius: "0px",
+								color: "#000000",
+								style: "none"
 							},
 							direction: "ltr",
-							colSpan: 6
+							colSpan: 5
 						},
 						children: [
 							{
-								type: "text-block-layout",
-								name: "section-title",
-								options: {
-									content: "<h3>Permit Information</h3>"
-								}
-							},
-							{
-								type: "form-field",
-								options: {
-									label: "Permit Number"
-								},
-								children: [
-									{
-										type: "text-editor",
-										name: "permit-number",
-										options: {
-											placeholder: "Auto-generated permit number",
-											readonly: true
-										}
-									}
-								]
-							},
-							{
-								type: "form-field",
-								options: {
-									label: "Type of Work Permit"
-								},
-								children: [
-									{
-										type: "select-editor",
-										name: "permit-type",
-										options: {
-											dataSource: "permit-types"
-										}
-									}
-								]
-							},
-							{
-								type: "form-field",
+								type: "flex-layout",
+								name: "flex-layout1",
 								options: {
-									label: "Work Location"
+									spacing: {
+										margin: "0px",
+										padding: "11px"
+									},
+									border: {
+										width: "1px",
+										radius: "0px",
+										color: "#000000",
+										style: "solid"
+									},
+									flexWrap: "nowrap",
+									justifyContent: "center",
+									alignItems: "center",
+									gap: "20px"
 								},
 								children: [
 									{
-										type: "text-editor",
-										name: "work-location",
+										type: "flex-item-layout",
+										name: "flex-item-layout1",
 										options: {
-											placeholder: "Enter specific work location"
-										}
-									}
-								]
-							},
-							{
-								type: "form-field",
-								options: {
-									label: "Description of Work"
-								},
-								children: [
+											spacing: {
+												margin: "0px",
+												padding: "0px"
+											},
+											border: {
+												width: "1px",
+												radius: "0px",
+												color: "#000000",
+												style: "none"
+											},
+											direction: "ltr"
+										},
+										children: [
+											{
+												type: "text-block-layout",
+												name: "text-block-layout1",
+												options: {
+													content: "<p><strong>Permit Number:</strong></p>"
+												}
+											}
+										]
+									},
 									{
-										type: "large-text-editor",
-										name: "work-description",
+										type: "flex-item-layout",
+										name: "flex-item-layout3",
 										options: {
-											placeholder: "Provide detailed description of work to be performed"
-										}
+											spacing: {
+												margin: "0px",
+												padding: "0px"
+											},
+											border: {
+												width: "1px",
+												radius: "0px",
+												color: "#000000",
+												style: "none"
+											},
+											direction: "ltr"
+										},
+										children: [
+											{
+												type: "text-editor",
+												name: "text-editor1",
+												options: {
+													multiple: false,
+													disabled: false,
+													readonly: true,
+													hasClearButton: false,
+													validations: {
+														regex: null,
+														required: null
+													},
+													flexWrap: "nowrap",
+													justifyContent: "flex-start",
+													alignItems: "flex-start"
+												}
+											}
+										]
 									}
 								]
 							}
@@ -14363,891 +14473,2133 @@ var children = [
 					},
 					{
 						type: "grid-item-layout",
-						name: "work-schedule",
+						name: "grid-item-layout5",
 						options: {
 							spacing: {
-								margin: "0px",
-								padding: "20px"
+								margin: "0px 0px 0px 0px",
+								padding: "0px 0px 0px 0px"
 							},
 							border: {
 								width: "1px",
-								radius: "8px",
-								color: "#e5e7eb",
-								style: "solid"
+								radius: "0px",
+								color: "#000000",
+								style: "none"
 							},
 							direction: "ltr",
-							colSpan: 6
+							colSpan: 4
 						},
 						children: [
 							{
-								type: "text-block-layout",
-								name: "section-title",
-								options: {
-									content: "<h3>Work Schedule</h3>"
-								}
-							},
-							{
-								type: "form-field",
-								options: {
-									label: "Work Start Date"
-								},
-								children: [
-									{
-										type: "date-time-editor",
-										name: "work-start-date",
-										options: {
-											placeholder: "Select start date"
-										}
-									}
-								]
-							},
-							{
-								type: "form-field",
-								options: {
-									label: "Work Start Time"
-								},
-								children: [
-									{
-										type: "time-duration",
-										name: "work-start-time",
-										options: {
-											placeholder: "Select start time"
-										}
-									}
-								]
-							},
-							{
-								type: "form-field",
-								options: {
-									label: "Expected End Date"
-								},
-								children: [
-									{
-										type: "date-time-editor",
-										name: "work-end-date",
-										options: {
-											placeholder: "Select expected end date"
-										}
-									}
-								]
-							},
-							{
-								type: "form-field",
+								type: "flex-layout",
+								name: "flex-layout1",
 								options: {
-									label: "Expected End Time"
+									spacing: {
+										margin: "0px",
+										padding: "10px"
+									},
+									border: {
+										width: "1px",
+										radius: "0px",
+										color: "#000000",
+										style: "solid"
+									},
+									flexWrap: "nowrap",
+									justifyContent: "center",
+									alignItems: "center",
+									gap: "20px"
 								},
 								children: [
 									{
-										type: "time-duration",
-										name: "work-end-time",
+										type: "flex-item-layout",
+										name: "flex-item-layout1",
 										options: {
-											placeholder: "Select expected end time"
-										}
-									}
-								]
-							},
-							{
-								type: "form-field",
-								options: {
-									label: "Estimated Duration (hours)"
-								},
-								children: [
+											spacing: {
+												margin: "0px",
+												padding: "0px"
+											},
+											border: {
+												width: "1px",
+												radius: "0px",
+												color: "#000000",
+												style: "none"
+											},
+											direction: "ltr"
+										},
+										children: [
+											{
+												type: "text-block-layout",
+												name: "text-block-layout1",
+												options: {
+													content: "<p><strong>Date:</strong></p>"
+												}
+											}
+										]
+									},
 									{
-										type: "number-editor",
-										name: "work-duration",
+										type: "flex-item-layout",
+										name: "flex-item-layout3",
 										options: {
-											min: 0.5,
-											max: 168,
-											step: 0.5,
-											placeholder: "Enter estimated duration"
-										}
+											spacing: {
+												margin: "0px",
+												padding: "0px"
+											},
+											border: {
+												width: "1px",
+												radius: "0px",
+												color: "#000000",
+												style: "none"
+											},
+											direction: "ltr"
+										},
+										children: [
+											{
+												type: "date-time-editor",
+												name: "date-time-editor1",
+												options: {
+													multiple: false,
+													format: {
+														id: "date",
+														title: "Date"
+													},
+													readonly: false,
+													disabled: false,
+													width: "200px",
+													validations: {
+														required: null,
+														greaterThan: null,
+														lessThan: null
+													}
+												}
+											}
+										]
 									}
 								]
 							}
 						]
-					}
-				]
-			},
-			{
-				type: "grid-layout",
-				name: "personnel-grid",
-				options: {
-					grid: {
-						"default": {
-							columns: 12,
-							rows: 1,
-							gap: "20px",
-							justifyItems: "stretch",
-							alignItems: "stretch"
-						}
-					},
-					spacing: {
-						margin: "0px 0px 30px",
-						padding: "0px"
 					},
-					border: {
-						width: "0px",
-						radius: "0px",
-						color: "#000000",
-						style: "none"
-					}
-				},
-				children: [
 					{
 						type: "grid-item-layout",
-						name: "applicant-info",
+						name: "grid-item-layout6",
 						options: {
 							spacing: {
-								margin: "0px",
-								padding: "20px"
+								margin: "0px 0px 0px 0px",
+								padding: "0px 0px 0px 0px"
 							},
 							border: {
-								width: "1px",
-								radius: "8px",
-								color: "#e5e7eb",
-								style: "solid"
+								width: "1px 1px 1px 1px",
+								radius: "0px 0px 0px 0px",
+								color: "#000000 #000000 #000000 #000000",
+								style: "none none none none"
 							},
 							direction: "ltr",
-							colSpan: 6
+							colSpan: 3
 						},
 						children: [
 							{
-								type: "text-block-layout",
-								name: "section-title",
-								options: {
-									content: "<h3>Permit Applicant</h3>"
-								}
-							},
-							{
-								type: "form-field",
+								type: "flex-layout",
+								name: "flex-layout1",
 								options: {
-									label: "Applicant Name"
+									spacing: {
+										margin: "0px",
+										padding: "10px"
+									},
+									border: {
+										width: "1px",
+										radius: "0px",
+										color: "#000000",
+										style: "solid"
+									},
+									flexWrap: "nowrap",
+									justifyContent: "center",
+									alignItems: "center",
+									gap: "20px"
 								},
 								children: [
 									{
-										type: "text-editor",
-										name: "applicant-name",
+										type: "flex-item-layout",
+										name: "flex-item-layout1",
 										options: {
-											placeholder: "Enter applicant full name"
-										}
-									}
-								]
-							},
-							{
-								type: "form-field",
-								options: {
-									label: "Department"
-								},
-								children: [
+											spacing: {
+												margin: "0px",
+												padding: "0px"
+											},
+											border: {
+												width: "1px",
+												radius: "0px",
+												color: "#000000",
+												style: "none"
+											},
+											direction: "ltr"
+										},
+										children: [
+											{
+												type: "text-block-layout",
+												name: "text-block-layout1",
+												options: {
+													content: "<p><strong>Type:</strong></p>"
+												}
+											}
+										]
+									},
 									{
-										type: "select-editor",
-										name: "applicant-department",
+										type: "flex-item-layout",
+										name: "flex-item-layout3",
 										options: {
-											dataSource: "departments"
-										}
+											spacing: {
+												margin: "0px",
+												padding: "0px"
+											},
+											border: {
+												width: "1px",
+												radius: "0px",
+												color: "#000000",
+												style: "none"
+											},
+											direction: "ltr"
+										},
+										children: [
+											{
+												type: "select-editor",
+												name: "select-editor1",
+												options: {
+													multiple: false,
+													disabled: false,
+													readonly: false,
+													hasClearButton: false,
+													validations: {
+														regex: null,
+														required: null
+													},
+													flexWrap: "nowrap",
+													justifyContent: "flex-start",
+													alignItems: "flex-start"
+												}
+											}
+										]
 									}
 								]
+							}
+						]
+					},
+					{
+						type: "grid-item-layout",
+						name: "grid-item-layout7",
+						options: {
+							spacing: {
+								margin: "0px 0px 0px 0px",
+								padding: "0px 0px 0px 0px"
+							},
+							border: {
+								width: "1px",
+								radius: "0px",
+								color: "#000000",
+								style: "none"
 							},
+							direction: "ltr",
+							colSpan: 6
+						},
+						children: [
 							{
-								type: "form-field",
-								options: {
-									label: "Contact Phone"
-								},
+								type: "flex-layout",
+								name: "flex-layout3",
 								children: [
 									{
-										type: "text-editor",
-										name: "applicant-phone",
+										type: "flex-item-layout",
+										name: "flex-item-layout4",
+										children: [
+											{
+												type: "text-block-layout",
+												name: "text-block-layout3",
+												options: {
+													content: "<p><strong>Work Description:</strong></p>"
+												}
+											}
+										],
 										options: {
-											placeholder: "Enter contact phone number"
+											spacing: {
+												margin: "0px 0px 0px 0px",
+												padding: "0px 0px 0px 0px"
+											},
+											border: {
+												width: "1px",
+												radius: "0px",
+												color: "#000000",
+												style: "none"
+											},
+											direction: "ltr"
 										}
-									}
-								]
-							},
-							{
-								type: "form-field",
-								options: {
-									label: "Contact Email"
-								},
-								children: [
+									},
 									{
-										type: "text-editor",
-										name: "applicant-email",
+										type: "flex-item-layout",
+										name: "flex-item-layout5",
+										children: [
+											{
+												type: "large-text-editor",
+												name: "large-text-editor1",
+												options: {
+													multiple: false,
+													disabled: false,
+													readonly: false,
+													hasClearButton: false,
+													validations: {
+														regex: null,
+														required: null
+													}
+												}
+											}
+										],
 										options: {
-											placeholder: "Enter contact email"
+											spacing: {
+												margin: "0px 0px 0px 0px",
+												padding: "0px 0px 0px 0px"
+											},
+											border: {
+												width: "1px",
+												radius: "0px",
+												color: "#000000",
+												style: "none"
+											},
+											direction: "ltr"
 										}
 									}
-								]
+								],
+								options: {
+									spacing: {
+										margin: "0px",
+										padding: "10px"
+									},
+									border: {
+										width: "1px",
+										radius: "0px",
+										color: "#000000",
+										style: "solid"
+									},
+									flexWrap: "nowrap",
+									justifyContent: "center",
+									alignItems: "center",
+									gap: "20px"
+								}
 							}
 						]
 					},
 					{
 						type: "grid-item-layout",
-						name: "work-team",
+						name: "grid-item-layout8",
 						options: {
 							spacing: {
-								margin: "0px",
-								padding: "20px"
+								margin: "0px 0px 0px 0px",
+								padding: "0px 0px 0px 0px"
 							},
 							border: {
 								width: "1px",
-								radius: "8px",
-								color: "#e5e7eb",
-								style: "solid"
+								radius: "0px",
+								color: "#000000",
+								style: "none"
 							},
 							direction: "ltr",
 							colSpan: 6
 						},
 						children: [
 							{
-								type: "text-block-layout",
-								name: "section-title",
-								options: {
-									content: "<h3>Work Team Members</h3>"
-								}
-							},
-							{
-								type: "form-field",
-								options: {
-									label: "Team Leader"
-								},
+								type: "flex-layout",
+								name: "flex-layout4",
 								children: [
 									{
-										type: "text-editor",
-										name: "team-leader",
+										type: "flex-item-layout",
+										name: "flex-item-layout6",
+										children: [
+											{
+												type: "text-block-layout",
+												name: "text-block-layout4",
+												options: {
+													content: "<p><strong>Location:</strong></p>"
+												}
+											}
+										],
 										options: {
-											placeholder: "Enter team leader name"
+											spacing: {
+												margin: "0px 0px 0px 0px",
+												padding: "0px 0px 0px 0px"
+											},
+											border: {
+												width: "1px",
+												radius: "0px",
+												color: "#000000",
+												style: "none"
+											},
+											direction: "ltr"
 										}
-									}
-								]
-							},
-							{
-								type: "form-field",
-								options: {
-									label: "Team Members"
-								},
-								children: [
+									},
 									{
-										type: "large-text-editor",
-										name: "team-members",
+										type: "flex-item-layout",
+										name: "flex-item-layout6",
+										children: [
+											{
+												type: "text-editor",
+												name: "text-editor3",
+												options: {
+													multiple: false,
+													disabled: false,
+													readonly: false,
+													hasClearButton: false,
+													validations: {
+														regex: null,
+														required: null
+													},
+													flexWrap: "nowrap",
+													justifyContent: "flex-start",
+													alignItems: "flex-start"
+												}
+											}
+										],
 										options: {
-											placeholder: "List all team members involved in the work"
+											spacing: {
+												margin: "0px 0px 0px 0px",
+												padding: "0px 0px 0px 0px"
+											},
+											border: {
+												width: "1px",
+												radius: "0px",
+												color: "#000000",
+												style: "none"
+											},
+											direction: "ltr"
 										}
 									}
-								]
-							},
-							{
-								type: "form-field",
+								],
 								options: {
-									label: "Total Personnel"
-								},
-								children: [
-									{
-										type: "number-editor",
-										name: "total-personnel",
-										options: {
-											min: 1,
-											max: 50,
-											placeholder: "Enter total number of personnel"
-										}
-									}
-								]
+									spacing: {
+										margin: "0px",
+										padding: "10px"
+									},
+									border: {
+										width: "1px",
+										radius: "0px",
+										color: "#000000",
+										style: "solid"
+									},
+									flexWrap: "nowrap",
+									justifyContent: "center",
+									alignItems: "center",
+									gap: "20px"
+								}
 							}
 						]
 					}
 				]
 			},
 			{
-				type: "grid-layout",
-				name: "hazards-grid",
+				type: "grid-item-layout",
+				name: "grid-item-layout9",
 				options: {
-					grid: {
-						"default": {
-							columns: 12,
-							rows: 1,
-							gap: "20px",
-							justifyItems: "stretch",
-							alignItems: "stretch"
-						}
-					},
 					spacing: {
-						margin: "0px 0px 30px",
-						padding: "0px"
+						margin: "0px 0px 0px 0px",
+						padding: "0px 0px 0px 0px"
 					},
 					border: {
-						width: "0px",
+						width: "1px",
 						radius: "0px",
 						color: "#000000",
 						style: "none"
-					}
+					},
+					direction: "ltr",
+					colSpan: 6
 				},
 				children: [
 					{
-						type: "grid-item-layout",
-						name: "hazard-identification",
-						options: {
-							spacing: {
-								margin: "0px",
-								padding: "20px"
-							},
-							border: {
-								width: "1px",
-								radius: "8px",
-								color: "#e5e7eb",
-								style: "solid"
-							},
-							direction: "ltr",
-							colSpan: 6
-						},
+						type: "flex-layout",
+						name: "flex-layout5",
 						children: [
 							{
-								type: "text-block-layout",
-								name: "section-title",
-								options: {
-									content: "<h3>Hazard Identification</h3>"
-								}
-							},
-							{
-								type: "form-field",
-								options: {
-									label: "Hazards Present"
-								},
+								type: "flex-item-layout",
+								name: "flex-item-layout7",
 								children: [
 									{
-										type: "checkbox-editor",
-										name: "hazards-present",
+										type: "text-block-layout",
+										name: "text-block-layout5",
 										options: {
-											dataSource: [
-												"Fire/Explosion",
-												"Toxic Substances",
-												"Oxygen Deficiency",
-												"Electrical Hazards",
-												"Mechanical Hazards",
-												"Falling Objects",
-												"Confined Space",
-												"Working at Heights",
-												"Chemical Exposure",
-												"Noise",
-												"Other"
-											]
+											content: "<p><strong>Applicant Name:</strong></p>"
 										}
 									}
-								]
+								],
+								options: {
+									spacing: {
+										margin: "0px 0px 0px 0px",
+										padding: "0px 0px 0px 0px"
+									},
+									border: {
+										width: "1px",
+										radius: "0px",
+										color: "#000000",
+										style: "none"
+									},
+									direction: "ltr"
+								}
 							},
 							{
-								type: "form-field",
-								options: {
-									label: "Additional Hazards"
-								},
+								type: "flex-item-layout",
+								name: "flex-item-layout8",
 								children: [
 									{
-										type: "large-text-editor",
-										name: "additional-hazards",
+										type: "text-editor",
+										name: "text-editor4",
 										options: {
-											placeholder: "Describe any additional hazards not listed above"
+											multiple: false,
+											disabled: false,
+											readonly: false,
+											hasClearButton: false,
+											validations: {
+												regex: null,
+												required: null
+											}
 										}
 									}
-								]
+								],
+								options: {
+									spacing: {
+										margin: "0px 0px 0px 0px",
+										padding: "0px 0px 0px 0px"
+									},
+									border: {
+										width: "1px",
+										radius: "0px",
+										color: "#000000",
+										style: "none"
+									},
+									direction: "ltr"
+								}
 							}
-						]
-					},
-					{
-						type: "grid-item-layout",
-						name: "control-measures",
+						],
 						options: {
 							spacing: {
 								margin: "0px",
-								padding: "20px"
+								padding: "10px"
 							},
 							border: {
 								width: "1px",
-								radius: "8px",
-								color: "#e5e7eb",
+								radius: "0px",
+								color: "#000000",
 								style: "solid"
 							},
-							direction: "ltr",
-							colSpan: 6
-						},
-						children: [
-							{
-								type: "text-block-layout",
-								name: "section-title",
-								options: {
-									content: "<h3>Control Measures</h3>"
-								}
-							},
-							{
-								type: "form-field",
-								options: {
-									label: "PPE Required"
-								},
-								children: [
-									{
-										type: "checkbox-editor",
-										name: "ppe-required",
-										options: {
-											dataSource: [
-												"Hard Hat",
-												"Safety Glasses",
-												"Safety Boots",
-												"Gloves",
-												"Respirator",
-												"Hearing Protection",
-												"Fall Protection",
-												"Chemical Suit",
-												"Other"
-											]
-										}
-									}
-								]
-							},
-							{
-								type: "form-field",
-								options: {
-									label: "Safety Measures"
-								},
-								children: [
-									{
-										type: "large-text-editor",
-										name: "safety-measures",
-										options: {
-											placeholder: "Describe safety measures and procedures to be followed"
-										}
-									}
-								]
-							}
-						]
+							flexWrap: "nowrap",
+							justifyContent: "center",
+							alignItems: "center",
+							gap: "20px"
+						}
 					}
 				]
 			},
 			{
-				type: "grid-layout",
-				name: "authorizations-grid",
+				type: "grid-item-layout",
+				name: "grid-item-layout10",
 				options: {
+					spacing: {
+						margin: "0px",
+						padding: "10px"
+					},
+					border: {
+						width: "1px",
+						radius: "0px",
+						color: "#000000",
+						style: "solid"
+					},
+					direction: "ltr",
+					colSpan: 12,
 					grid: {
 						"default": {
-							columns: 12,
 							rows: 1,
-							gap: "20px",
+							columns: 1,
 							justifyItems: "stretch",
-							alignItems: "stretch"
+							alignItems: "stretch",
+							gap: "0px 0px"
 						}
 					},
+					backgroundColor: "rgb(0,166,244)"
+				},
+				children: [
+					{
+						type: "text-block-layout",
+						name: "text-block-layout5",
+						options: {
+							content: "<p>1. STOP, step back and think</p>"
+						}
+					}
+				]
+			},
+			{
+				type: "grid-item-layout",
+				name: "grid-item-layout11",
+				options: {
 					spacing: {
-						margin: "0px 0px 30px",
-						padding: "0px"
+						margin: "0px 0px 0px 0px",
+						padding: "0px 0px 0px 0px"
 					},
 					border: {
-						width: "0px",
+						width: "1px",
 						radius: "0px",
 						color: "#000000",
 						style: "none"
-					}
+					},
+					direction: "ltr",
+					colSpan: 10
 				},
 				children: [
 					{
-						type: "grid-item-layout",
-						name: "authorizations",
+						type: "flex-layout",
+						name: "flex-layout3",
+						children: [
+							{
+								type: "flex-item-layout",
+								name: "flex-item-layout4",
+								children: [
+									{
+										type: "text-block-layout",
+										name: "text-block-layout3",
+										options: {
+											content: "<p>Do I understand what I need to do? </p>"
+										}
+									}
+								],
+								options: {
+									spacing: {
+										margin: "0px 0px 0px 0px",
+										padding: "0px 0px 0px 0px"
+									},
+									border: {
+										width: "1px",
+										radius: "0px",
+										color: "#000000",
+										style: "none"
+									},
+									direction: "ltr"
+								}
+							}
+						],
 						options: {
 							spacing: {
 								margin: "0px",
-								padding: "20px"
+								padding: "10px"
 							},
 							border: {
 								width: "1px",
-								radius: "8px",
-								color: "#e5e7eb",
-								style: "solid"
+								radius: "0px",
+								color: "#000000",
+								style: "none"
 							},
-							direction: "ltr",
-							colSpan: 12
-						},
+							flexWrap: "nowrap",
+							justifyContent: "center",
+							alignItems: "center",
+							gap: "20px"
+						}
+					}
+				]
+			},
+			{
+				type: "grid-item-layout",
+				name: "grid-item-layout12",
+				options: {
+					spacing: {
+						margin: "0px 0px 0px 0px",
+						padding: "0px 0px 0px 0px"
+					},
+					border: {
+						width: "1px",
+						radius: "0px",
+						color: "#000000",
+						style: "none"
+					},
+					direction: "ltr",
+					colSpan: 2,
+					grid: {
+						"default": {
+							rows: 1,
+							columns: 1,
+							justifyItems: "stretch",
+							alignItems: "stretch",
+							gap: "0px 0px"
+						}
+					}
+				},
+				children: [
+					{
+						type: "flex-layout",
+						name: "flex-layout3",
 						children: [
 							{
-								type: "text-block-layout",
-								name: "section-title",
-								options: {
-									content: "<h3>Authorizations & Approvals</h3>"
-								}
-							},
-							{
-								type: "form-field",
-								options: {
-									label: "Supervisor Approval"
-								},
+								type: "flex-item-layout",
+								name: "flex-item-layout4",
 								children: [
 									{
-										type: "select-editor",
-										name: "supervisor-approval",
+										type: "selection-list-editor",
+										name: "selection-list-editor1",
+										path: "select-option-row-1",
 										options: {
-											dataSource: "approval-status"
+											multiple: false,
+											direction: {
+												id: "horizontal"
+											},
+											disabled: false,
+											readonly: false,
+											dataSource: "yes-no-options",
+											textField: "title",
+											valueField: "value"
 										}
 									}
-								]
-							},
-							{
-								type: "form-field",
+								],
 								options: {
-									label: "Supervisor Name"
-								},
-								children: [
-									{
-										type: "text-editor",
-										name: "supervisor-name",
+									spacing: {
+										margin: "0px 0px 0px 0px",
+										padding: "0px 0px 0px 0px"
+									},
+									border: {
+										width: "1px",
+										radius: "0px",
+										color: "#000000",
+										style: "none"
+									},
+									direction: "ltr"
+								}
+							}
+						],
+						options: {
+							spacing: {
+								margin: "0px",
+								padding: "0px"
+							},
+							border: {
+								width: "1px",
+								radius: "0px",
+								color: "#000000",
+								style: "none"
+							},
+							flexWrap: "nowrap",
+							justifyContent: "center",
+							alignItems: "center",
+							gap: "20px"
+						}
+					}
+				]
+			},
+			{
+				type: "grid-item-layout",
+				name: "grid-item-layout13",
+				options: {
+					spacing: {
+						margin: "0px 0px 0px 0px",
+						padding: "0px 0px 0px 0px"
+					},
+					border: {
+						width: "1px",
+						radius: "0px",
+						color: "#000000",
+						style: "none"
+					},
+					direction: "ltr",
+					colSpan: 10
+				},
+				children: [
+					{
+						type: "flex-layout",
+						name: "flex-layout12",
+						children: [
+							{
+								type: "flex-item-layout",
+								name: "flex-item-layout12",
+								children: [
+									{
+										type: "text-block-layout",
+										name: "text-block-layout12",
 										options: {
-											placeholder: "Enter supervisor name"
+											content: "<p>Do I need a SWMS for any &#x27;High Risk construction work&#x27;?</p>"
 										}
 									}
-								]
+								],
+								options: {
+									spacing: {
+										margin: "0px 0px 0px 0px",
+										padding: "0px 0px 0px 0px"
+									},
+									border: {
+										width: "1px",
+										radius: "0px",
+										color: "#000000",
+										style: "none"
+									},
+									direction: "ltr"
+								}
+							}
+						],
+						options: {
+							spacing: {
+								margin: "0px",
+								padding: "10px"
+							},
+							border: {
+								width: "1px",
+								radius: "0px",
+								color: "#000000",
+								style: "none"
 							},
+							flexWrap: "nowrap",
+							justifyContent: "center",
+							alignItems: "center",
+							gap: "20px"
+						}
+					}
+				]
+			},
+			{
+				type: "grid-item-layout",
+				options: {
+					spacing: {
+						margin: "0px 0px 0px 0px",
+						padding: "0px 0px 0px 0px"
+					},
+					border: {
+						width: "1px",
+						radius: "0px",
+						color: "#000000",
+						style: "none"
+					},
+					direction: "ltr",
+					colSpan: 2,
+					grid: {
+						"default": {
+							rows: 1,
+							columns: 1,
+							justifyItems: "stretch",
+							alignItems: "stretch",
+							gap: "0px 0px"
+						}
+					}
+				},
+				children: [
+					{
+						type: "flex-layout",
+						children: [
 							{
-								type: "form-field",
+								type: "flex-item-layout",
+								children: [
+									{
+										type: "selection-list-editor",
+										path: "select-option-row-2",
+										options: {
+											multiple: false,
+											direction: {
+												id: "horizontal"
+											},
+											disabled: false,
+											readonly: false,
+											dataSource: "yes-no-options",
+											textField: "title",
+											valueField: "value"
+										},
+										name: "selection-list-editor2"
+									}
+								],
 								options: {
-									label: "Approval Date"
+									spacing: {
+										margin: "0px 0px 0px 0px",
+										padding: "0px 0px 0px 0px"
+									},
+									border: {
+										width: "1px",
+										radius: "0px",
+										color: "#000000",
+										style: "none"
+									},
+									direction: "ltr"
 								},
+								name: "flex-item-layout18"
+							}
+						],
+						options: {
+							spacing: {
+								margin: "0px",
+								padding: "0px"
+							},
+							border: {
+								width: "1px",
+								radius: "0px",
+								color: "#000000",
+								style: "none"
+							},
+							flexWrap: "nowrap",
+							justifyContent: "center",
+							alignItems: "center",
+							gap: "20px"
+						},
+						name: "flex-layout18"
+					}
+				],
+				name: "grid-item-layout18"
+			},
+			{
+				type: "grid-item-layout",
+				name: "grid-item-layout19",
+				options: {
+					spacing: {
+						margin: "0px 0px 0px 0px",
+						padding: "0px 0px 0px 0px"
+					},
+					border: {
+						width: "1px",
+						radius: "0px",
+						color: "#000000",
+						style: "none"
+					},
+					direction: "ltr",
+					colSpan: 10
+				},
+				children: [
+					{
+						type: "flex-layout",
+						name: "flex-layout13",
+						children: [
+							{
+								type: "flex-item-layout",
+								name: "flex-item-layout13",
 								children: [
 									{
-										type: "date-time-editor",
-										name: "supervisor-date",
+										type: "text-block-layout",
+										name: "text-block-layout13",
 										options: {
-											placeholder: "Select approval date"
+											content: "<p>Do I need any permits (e.g. hot work&#x2F;confined space&#x2F;dig)?</p>"
 										}
 									}
-								]
+								],
+								options: {
+									spacing: {
+										margin: "0px 0px 0px 0px",
+										padding: "0px 0px 0px 0px"
+									},
+									border: {
+										width: "1px",
+										radius: "0px",
+										color: "#000000",
+										style: "none"
+									},
+									direction: "ltr"
+								}
+							}
+						],
+						options: {
+							spacing: {
+								margin: "0px",
+								padding: "10px"
+							},
+							border: {
+								width: "1px",
+								radius: "0px",
+								color: "#000000",
+								style: "none"
 							},
+							flexWrap: "nowrap",
+							justifyContent: "center",
+							alignItems: "center",
+							gap: "20px"
+						}
+					}
+				]
+			},
+			{
+				type: "grid-item-layout",
+				options: {
+					spacing: {
+						margin: "0px 0px 0px 0px",
+						padding: "0px 0px 0px 0px"
+					},
+					border: {
+						width: "1px",
+						radius: "0px",
+						color: "#000000",
+						style: "none"
+					},
+					direction: "ltr",
+					colSpan: 2,
+					grid: {
+						"default": {
+							rows: 1,
+							columns: 1,
+							justifyItems: "stretch",
+							alignItems: "stretch",
+							gap: "0px 0px"
+						}
+					}
+				},
+				children: [
+					{
+						type: "flex-layout",
+						children: [
 							{
-								type: "form-field",
+								type: "flex-item-layout",
+								children: [
+									{
+										type: "selection-list-editor",
+										path: "select-option-row-3",
+										options: {
+											multiple: false,
+											direction: {
+												id: "horizontal"
+											},
+											disabled: false,
+											readonly: false,
+											dataSource: "yes-no-options",
+											textField: "title",
+											valueField: "value"
+										},
+										name: "selection-list-editor3"
+									}
+								],
 								options: {
-									label: "Safety Officer Approval"
+									spacing: {
+										margin: "0px 0px 0px 0px",
+										padding: "0px 0px 0px 0px"
+									},
+									border: {
+										width: "1px",
+										radius: "0px",
+										color: "#000000",
+										style: "none"
+									},
+									direction: "ltr"
 								},
+								name: "flex-item-layout19"
+							}
+						],
+						options: {
+							spacing: {
+								margin: "0px",
+								padding: "0px"
+							},
+							border: {
+								width: "1px",
+								radius: "0px",
+								color: "#000000",
+								style: "none"
+							},
+							flexWrap: "nowrap",
+							justifyContent: "center",
+							alignItems: "center",
+							gap: "20px"
+						},
+						name: "flex-layout19"
+					}
+				],
+				name: "grid-item-layout19"
+			},
+			{
+				type: "grid-item-layout",
+				name: "grid-item-layout20",
+				options: {
+					spacing: {
+						margin: "0px 0px 0px 0px",
+						padding: "0px 0px 0px 0px"
+					},
+					border: {
+						width: "1px",
+						radius: "0px",
+						color: "#000000",
+						style: "none"
+					},
+					direction: "ltr",
+					colSpan: 10
+				},
+				children: [
+					{
+						type: "flex-layout",
+						name: "flex-layout14",
+						children: [
+							{
+								type: "flex-item-layout",
+								name: "flex-item-layout14",
 								children: [
 									{
-										type: "select-editor",
-										name: "safety-officer-approval",
+										type: "text-block-layout",
+										name: "text-block-layout14",
 										options: {
-											dataSource: "approval-status"
+											content: "<p>Do I have the correct PPE in good condition for the task?</p>"
 										}
 									}
-								]
+								],
+								options: {
+									spacing: {
+										margin: "0px 0px 0px 0px",
+										padding: "0px 0px 0px 0px"
+									},
+									border: {
+										width: "1px",
+										radius: "0px",
+										color: "#000000",
+										style: "none"
+									},
+									direction: "ltr"
+								}
+							}
+						],
+						options: {
+							spacing: {
+								margin: "0px",
+								padding: "10px"
+							},
+							border: {
+								width: "1px",
+								radius: "0px",
+								color: "#000000",
+								style: "none"
+							},
+							flexWrap: "nowrap",
+							justifyContent: "center",
+							alignItems: "center",
+							gap: "20px"
+						}
+					}
+				]
+			},
+			{
+				type: "grid-item-layout",
+				options: {
+					spacing: {
+						margin: "0px 0px 0px 0px",
+						padding: "0px 0px 0px 0px"
+					},
+					border: {
+						width: "1px",
+						radius: "0px",
+						color: "#000000",
+						style: "none"
+					},
+					direction: "ltr",
+					colSpan: 2,
+					grid: {
+						"default": {
+							rows: 1,
+							columns: 1,
+							justifyItems: "stretch",
+							alignItems: "stretch",
+							gap: "0px 0px"
+						}
+					}
+				},
+				children: [
+					{
+						type: "flex-layout",
+						children: [
+							{
+								type: "flex-item-layout",
+								children: [
+									{
+										type: "selection-list-editor",
+										path: "select-option-row-4",
+										options: {
+											multiple: false,
+											direction: {
+												id: "horizontal"
+											},
+											disabled: false,
+											readonly: false,
+											dataSource: "yes-no-options",
+											textField: "title",
+											valueField: "value"
+										},
+										name: "selection-list-editor4"
+									}
+								],
+								options: {
+									spacing: {
+										margin: "0px 0px 0px 0px",
+										padding: "0px 0px 0px 0px"
+									},
+									border: {
+										width: "1px",
+										radius: "0px",
+										color: "#000000",
+										style: "none"
+									},
+									direction: "ltr"
+								},
+								name: "flex-item-layout20"
+							}
+						],
+						options: {
+							spacing: {
+								margin: "0px",
+								padding: "0px"
+							},
+							border: {
+								width: "1px",
+								radius: "0px",
+								color: "#000000",
+								style: "none"
+							},
+							flexWrap: "nowrap",
+							justifyContent: "center",
+							alignItems: "center",
+							gap: "20px"
+						},
+						name: "flex-layout20"
+					}
+				],
+				name: "grid-item-layout20"
+			},
+			{
+				type: "grid-item-layout",
+				name: "grid-item-layout21",
+				options: {
+					spacing: {
+						margin: "0px 0px 0px 0px",
+						padding: "0px 0px 0px 0px"
+					},
+					border: {
+						width: "1px",
+						radius: "0px",
+						color: "#000000",
+						style: "none"
+					},
+					direction: "ltr",
+					colSpan: 10
+				},
+				children: [
+					{
+						type: "flex-layout",
+						name: "flex-layout15",
+						children: [
+							{
+								type: "flex-item-layout",
+								name: "flex-item-layout15",
+								children: [
+									{
+										type: "text-block-layout",
+										name: "text-block-layout15",
+										options: {
+											content: "<p>Do I have the suitable tools and equipment for the task?</p>"
+										}
+									}
+								],
+								options: {
+									spacing: {
+										margin: "0px 0px 0px 0px",
+										padding: "0px 0px 0px 0px"
+									},
+									border: {
+										width: "1px",
+										radius: "0px",
+										color: "#000000",
+										style: "none"
+									},
+									direction: "ltr"
+								}
+							}
+						],
+						options: {
+							spacing: {
+								margin: "0px",
+								padding: "10px"
+							},
+							border: {
+								width: "1px",
+								radius: "0px",
+								color: "#000000",
+								style: "none"
+							},
+							flexWrap: "nowrap",
+							justifyContent: "center",
+							alignItems: "center",
+							gap: "20px"
+						}
+					}
+				]
+			},
+			{
+				type: "grid-item-layout",
+				options: {
+					spacing: {
+						margin: "0px 0px 0px 0px",
+						padding: "0px 0px 0px 0px"
+					},
+					border: {
+						width: "1px",
+						radius: "0px",
+						color: "#000000",
+						style: "none"
+					},
+					direction: "ltr",
+					colSpan: 2,
+					grid: {
+						"default": {
+							rows: 1,
+							columns: 1,
+							justifyItems: "stretch",
+							alignItems: "stretch",
+							gap: "0px 0px"
+						}
+					}
+				},
+				children: [
+					{
+						type: "flex-layout",
+						children: [
+							{
+								type: "flex-item-layout",
+								children: [
+									{
+										type: "selection-list-editor",
+										path: "select-option-row-5",
+										options: {
+											multiple: false,
+											direction: {
+												id: "horizontal"
+											},
+											disabled: false,
+											readonly: false,
+											dataSource: "yes-no-options",
+											textField: "title",
+											valueField: "value"
+										},
+										name: "selection-list-editor5"
+									}
+								],
+								options: {
+									spacing: {
+										margin: "0px 0px 0px 0px",
+										padding: "0px 0px 0px 0px"
+									},
+									border: {
+										width: "1px",
+										radius: "0px",
+										color: "#000000",
+										style: "none"
+									},
+									direction: "ltr"
+								},
+								name: "flex-item-layout21"
+							}
+						],
+						options: {
+							spacing: {
+								margin: "0px",
+								padding: "0px"
+							},
+							border: {
+								width: "1px",
+								radius: "0px",
+								color: "#000000",
+								style: "none"
+							},
+							flexWrap: "nowrap",
+							justifyContent: "center",
+							alignItems: "center",
+							gap: "20px"
+						},
+						name: "flex-layout21"
+					}
+				],
+				name: "grid-item-layout21"
+			},
+			{
+				type: "grid-item-layout",
+				name: "grid-item-layout22",
+				options: {
+					spacing: {
+						margin: "0px 0px 0px 0px",
+						padding: "0px 0px 0px 0px"
+					},
+					border: {
+						width: "1px",
+						radius: "0px",
+						color: "#000000",
+						style: "none"
+					},
+					direction: "ltr",
+					colSpan: 10
+				},
+				children: [
+					{
+						type: "flex-layout",
+						name: "flex-layout16",
+						children: [
+							{
+								type: "flex-item-layout",
+								name: "flex-item-layout16",
+								children: [
+									{
+										type: "text-block-layout",
+										name: "text-block-layout16",
+										options: {
+											content: "<p>Do I have my vehicle parked appropriately?</p>"
+										}
+									}
+								],
+								options: {
+									spacing: {
+										margin: "0px 0px 0px 0px",
+										padding: "0px 0px 0px 0px"
+									},
+									border: {
+										width: "1px",
+										radius: "0px",
+										color: "#000000",
+										style: "none"
+									},
+									direction: "ltr"
+								}
+							}
+						],
+						options: {
+							spacing: {
+								margin: "0px",
+								padding: "10px"
+							},
+							border: {
+								width: "1px",
+								radius: "0px",
+								color: "#000000",
+								style: "none"
+							},
+							flexWrap: "nowrap",
+							justifyContent: "center",
+							alignItems: "center",
+							gap: "20px"
+						}
+					}
+				]
+			},
+			{
+				type: "grid-item-layout",
+				options: {
+					spacing: {
+						margin: "0px 0px 0px 0px",
+						padding: "0px 0px 0px 0px"
+					},
+					border: {
+						width: "1px",
+						radius: "0px",
+						color: "#000000",
+						style: "none"
+					},
+					direction: "ltr",
+					colSpan: 2,
+					grid: {
+						"default": {
+							rows: 1,
+							columns: 1,
+							justifyItems: "stretch",
+							alignItems: "stretch",
+							gap: "0px 0px"
+						}
+					}
+				},
+				children: [
+					{
+						type: "flex-layout",
+						children: [
+							{
+								type: "flex-item-layout",
+								children: [
+									{
+										type: "selection-list-editor",
+										path: "select-option-row-6",
+										options: {
+											multiple: false,
+											direction: {
+												id: "horizontal"
+											},
+											disabled: false,
+											readonly: false,
+											dataSource: "yes-no-options",
+											textField: "title",
+											valueField: "value"
+										},
+										name: "selection-list-editor6"
+									}
+								],
+								options: {
+									spacing: {
+										margin: "0px 0px 0px 0px",
+										padding: "0px 0px 0px 0px"
+									},
+									border: {
+										width: "1px",
+										radius: "0px",
+										color: "#000000",
+										style: "none"
+									},
+									direction: "ltr"
+								},
+								name: "flex-item-layout22"
+							}
+						],
+						options: {
+							spacing: {
+								margin: "0px",
+								padding: "0px"
+							},
+							border: {
+								width: "1px",
+								radius: "0px",
+								color: "#000000",
+								style: "none"
 							},
+							flexWrap: "nowrap",
+							justifyContent: "center",
+							alignItems: "center",
+							gap: "20px"
+						},
+						name: "flex-layout22"
+					}
+				],
+				name: "grid-item-layout22"
+			},
+			{
+				type: "grid-item-layout",
+				name: "grid-item-layout23",
+				options: {
+					spacing: {
+						margin: "0px 0px 0px 0px",
+						padding: "0px 0px 0px 0px"
+					},
+					border: {
+						width: "1px",
+						radius: "0px",
+						color: "#000000",
+						style: "none"
+					},
+					direction: "ltr",
+					colSpan: 10
+				},
+				children: [
+					{
+						type: "flex-layout",
+						name: "flex-layout17",
+						children: [
+							{
+								type: "flex-item-layout",
+								name: "flex-item-layout17",
+								children: [
+									{
+										type: "text-block-layout",
+										name: "text-block-layout17",
+										options: {
+											content: "<p>Am I trained, competent, licensed and fit to perform the task?</p>"
+										}
+									}
+								],
+								options: {
+									spacing: {
+										margin: "0px 0px 0px 0px",
+										padding: "0px 0px 0px 0px"
+									},
+									border: {
+										width: "1px",
+										radius: "0px",
+										color: "#000000",
+										style: "none"
+									},
+									direction: "ltr"
+								}
+							}
+						],
+						options: {
+							spacing: {
+								margin: "0px",
+								padding: "10px"
+							},
+							border: {
+								width: "1px",
+								radius: "0px",
+								color: "#000000",
+								style: "none"
+							},
+							flexWrap: "nowrap",
+							justifyContent: "center",
+							alignItems: "center",
+							gap: "20px"
+						}
+					}
+				]
+			},
+			{
+				type: "grid-item-layout",
+				options: {
+					spacing: {
+						margin: "0px 0px 0px 0px",
+						padding: "0px 0px 0px 0px"
+					},
+					border: {
+						width: "1px",
+						radius: "0px",
+						color: "#000000",
+						style: "none"
+					},
+					direction: "ltr",
+					colSpan: 2,
+					grid: {
+						"default": {
+							rows: 1,
+							columns: 1,
+							justifyItems: "stretch",
+							alignItems: "stretch",
+							gap: "0px 0px"
+						}
+					}
+				},
+				children: [
+					{
+						type: "flex-layout",
+						children: [
 							{
-								type: "form-field",
-								options: {
-									label: "Safety Officer Name"
-								},
+								type: "flex-item-layout",
 								children: [
 									{
-										type: "text-editor",
-										name: "safety-officer-name",
+										type: "selection-list-editor",
+										path: "select-option-row-7",
 										options: {
-											placeholder: "Enter safety officer name"
-										}
+											multiple: false,
+											direction: {
+												id: "horizontal"
+											},
+											disabled: false,
+											readonly: false,
+											dataSource: "yes-no-options",
+											textField: "title",
+											valueField: "value"
+										},
+										name: "selection-list-editor7"
 									}
-								]
-							},
-							{
-								type: "form-field",
+								],
 								options: {
-									label: "Approval Date"
+									spacing: {
+										margin: "0px 0px 0px 0px",
+										padding: "0px 0px 0px 0px"
+									},
+									border: {
+										width: "1px",
+										radius: "0px",
+										color: "#000000",
+										style: "none"
+									},
+									direction: "ltr"
 								},
-								children: [
-									{
-										type: "date-time-editor",
-										name: "safety-officer-date",
-										options: {
-											placeholder: "Select approval date"
-										}
-									}
-								]
+								name: "flex-item-layout23"
 							}
-						]
+						],
+						options: {
+							spacing: {
+								margin: "0px",
+								padding: "0px"
+							},
+							border: {
+								width: "1px",
+								radius: "0px",
+								color: "#000000",
+								style: "none"
+							},
+							flexWrap: "nowrap",
+							justifyContent: "center",
+							alignItems: "center",
+							gap: "20px"
+						},
+						name: "flex-layout23"
 					}
-				]
+				],
+				name: "grid-item-layout23"
 			},
 			{
-				type: "grid-layout",
-				name: "completion-grid",
+				type: "grid-item-layout",
+				name: "grid-item-layout24",
 				options: {
+					spacing: {
+						margin: "0px",
+						padding: "10px"
+					},
+					border: {
+						width: "1px",
+						radius: "0px",
+						color: "#000000",
+						style: "solid"
+					},
+					direction: "ltr",
+					colSpan: 12,
 					grid: {
 						"default": {
-							columns: 12,
 							rows: 1,
-							gap: "20px",
+							columns: 1,
 							justifyItems: "stretch",
-							alignItems: "stretch"
+							alignItems: "stretch",
+							gap: "0px 0px"
 						}
 					},
+					backgroundColor: "rgb(0,166,244)"
+				},
+				children: [
+					{
+						type: "text-block-layout",
+						name: "text-block-layout5",
+						options: {
+							content: "<p>2. Identify the hazard(s) If you tick <span style=\"color:#ff0000\">YES</span>, complete a SWMS.</p>"
+						}
+					}
+				]
+			},
+			{
+				type: "grid-item-layout",
+				name: "grid-item-layout25",
+				options: {
 					spacing: {
-						margin: "0px 0px 30px",
-						padding: "0px"
+						margin: "0px 0px 0px 0px",
+						padding: "0px 0px 0px 0px"
 					},
 					border: {
-						width: "0px",
+						width: "1px",
 						radius: "0px",
 						color: "#000000",
 						style: "none"
-					}
+					},
+					direction: "ltr",
+					colSpan: 10
 				},
 				children: [
 					{
-						type: "grid-item-layout",
-						name: "work-completion",
+						type: "flex-layout",
+						name: "flex-layout24",
+						children: [
+							{
+								type: "flex-item-layout",
+								name: "flex-item-layout24",
+								children: [
+									{
+										type: "text-block-layout",
+										name: "text-block-layout18",
+										options: {
+											content: "<p>Fire/Explosion Hazards</p>"
+										}
+									}
+								],
+								options: {
+									spacing: {
+										margin: "0px 0px 0px 0px",
+										padding: "0px 0px 0px 0px"
+									},
+									border: {
+										width: "1px",
+										radius: "0px",
+										color: "#000000",
+										style: "none"
+									},
+									direction: "ltr"
+								}
+							}
+						],
 						options: {
 							spacing: {
 								margin: "0px",
-								padding: "20px"
+								padding: "10px"
 							},
 							border: {
 								width: "1px",
-								radius: "8px",
-								color: "#e5e7eb",
-								style: "solid"
+								radius: "0px",
+								color: "#000000",
+								style: "none"
 							},
-							direction: "ltr",
-							colSpan: 12
-						},
+							flexWrap: "nowrap",
+							justifyContent: "center",
+							alignItems: "center",
+							gap: "20px"
+						}
+					}
+				]
+			},
+			{
+				type: "grid-item-layout",
+				name: "grid-item-layout26",
+				options: {
+					spacing: {
+						margin: "0px 0px 0px 0px",
+						padding: "0px 0px 0px 0px"
+					},
+					border: {
+						width: "1px",
+						radius: "0px",
+						color: "#000000",
+						style: "none"
+					},
+					direction: "ltr",
+					colSpan: 2,
+					grid: {
+						"default": {
+							rows: 1,
+							columns: 1,
+							justifyItems: "stretch",
+							alignItems: "stretch",
+							gap: "0px 0px"
+						}
+					}
+				},
+				children: [
+					{
+						type: "flex-layout",
+						name: "flex-layout25",
 						children: [
 							{
-								type: "text-block-layout",
-								name: "section-title",
-								options: {
-									content: "<h3>Work Completion & Closure</h3>"
-								}
-							},
-							{
-								type: "form-field",
-								options: {
-									label: "Work Completed"
-								},
+								type: "flex-item-layout",
+								name: "flex-item-layout25",
 								children: [
 									{
-										type: "select-editor",
-										name: "work-completed",
+										type: "selection-list-editor",
+										name: "selection-list-editor8",
+										path: "select-option-row-8",
 										options: {
-											dataSource: "work-completion-status"
+											multiple: false,
+											direction: {
+												id: "horizontal"
+											},
+											disabled: false,
+											readonly: false,
+											dataSource: "yes-no-options",
+											textField: "title",
+											valueField: "value"
 										}
 									}
-								]
-							},
-							{
-								type: "form-field",
+								],
 								options: {
-									label: "Completion Date"
-								},
-								children: [
-									{
-										type: "date-time-editor",
-										name: "completion-date",
-										options: {
-											placeholder: "Select completion date"
-										}
-									}
-								]
+									spacing: {
+										margin: "0px 0px 0px 0px",
+										padding: "0px 0px 0px 0px"
+									},
+									border: {
+										width: "1px",
+										radius: "0px",
+										color: "#000000",
+										style: "none"
+									},
+									direction: "ltr"
+								}
+							}
+						],
+						options: {
+							spacing: {
+								margin: "0px",
+								padding: "0px"
 							},
-							{
-								type: "form-field",
-								options: {
-									label: "Completion Time"
-								},
-								children: [
-									{
-										type: "time-duration",
-										name: "completion-time",
-										options: {
-											placeholder: "Select completion time"
-										}
-									}
-								]
+							border: {
+								width: "1px",
+								radius: "0px",
+								color: "#000000",
+								style: "none"
 							},
+							flexWrap: "nowrap",
+							justifyContent: "center",
+							alignItems: "center",
+							gap: "20px"
+						}
+					}
+				]
+			},
+			{
+				type: "grid-item-layout",
+				name: "grid-item-layout27",
+				options: {
+					spacing: {
+						margin: "0px 0px 0px 0px",
+						padding: "0px 0px 0px 0px"
+					},
+					border: {
+						width: "1px",
+						radius: "0px",
+						color: "#000000",
+						style: "none"
+					},
+					direction: "ltr",
+					colSpan: 10
+				},
+				children: [
+					{
+						type: "flex-layout",
+						name: "flex-layout26",
+						children: [
 							{
-								type: "form-field",
-								options: {
-									label: "Work Summary"
-								},
+								type: "flex-item-layout",
+								name: "flex-item-layout26",
 								children: [
 									{
-										type: "large-text-editor",
-										name: "work-summary",
+										type: "text-block-layout",
+										name: "text-block-layout19",
 										options: {
-											placeholder: "Provide summary of work completed and any issues encountered"
+											content: "<p>Toxic Substances & Chemical Exposure</p>"
 										}
 									}
-								]
-							},
-							{
-								type: "form-field",
+								],
 								options: {
-									label: "Work Area Restored"
-								},
-								children: [
-									{
-										type: "select-editor",
-										name: "area-restored",
-										options: {
-											dataSource: "yes-no-na-options"
-										}
-									}
-								]
+									spacing: {
+										margin: "0px 0px 0px 0px",
+										padding: "0px 0px 0px 0px"
+									},
+									border: {
+										width: "1px",
+										radius: "0px",
+										color: "#000000",
+										style: "none"
+									},
+									direction: "ltr"
+								}
 							}
-						]
+						],
+						options: {
+							spacing: {
+								margin: "0px",
+								padding: "10px"
+							},
+							border: {
+								width: "1px",
+								radius: "0px",
+								color: "#000000",
+								style: "none"
+							},
+							flexWrap: "nowrap",
+							justifyContent: "center",
+							alignItems: "center",
+							gap: "20px"
+						}
 					}
 				]
 			},
 			{
-				type: "grid-layout",
-				name: "signatures-grid",
+				type: "grid-item-layout",
+				name: "grid-item-layout28",
 				options: {
-					grid: {
-						"default": {
-							columns: 12,
-							rows: 1,
-							gap: "20px",
-							justifyItems: "stretch",
-							alignItems: "stretch"
-						}
-					},
 					spacing: {
-						margin: "0px",
-						padding: "0px"
+						margin: "0px 0px 0px 0px",
+						padding: "0px 0px 0px 0px"
 					},
 					border: {
-						width: "0px",
+						width: "1px",
 						radius: "0px",
 						color: "#000000",
 						style: "none"
+					},
+					direction: "ltr",
+					colSpan: 2,
+					grid: {
+						"default": {
+							rows: 1,
+							columns: 1,
+							justifyItems: "stretch",
+							alignItems: "stretch",
+							gap: "0px 0px"
+						}
 					}
 				},
 				children: [
 					{
-						type: "grid-item-layout",
-						name: "applicant-signature",
-						options: {
-							spacing: {
-								margin: "0px",
-								padding: "20px"
-							},
-							border: {
-								width: "1px",
-								radius: "8px",
-								color: "#e5e7eb",
-								style: "solid"
-							},
-							direction: "ltr",
-							colSpan: 4
-						},
+						type: "flex-layout",
+						name: "flex-layout27",
 						children: [
 							{
-								type: "form-field",
-								options: {
-									label: "Applicant Signature"
-								},
+								type: "flex-item-layout",
+								name: "flex-item-layout27",
 								children: [
 									{
-										type: "signature",
-										name: "applicant-signature-field"
+										type: "selection-list-editor",
+										name: "selection-list-editor9",
+										path: "select-option-row-9",
+										options: {
+											multiple: false,
+											direction: {
+												id: "horizontal"
+											},
+											disabled: false,
+											readonly: false,
+											dataSource: "yes-no-options",
+											textField: "title",
+											valueField: "value"
+										}
 									}
-								]
-							},
-							{
-								type: "form-field",
+								],
 								options: {
-									label: "Date"
-								},
-								children: [
-									{
-										type: "date-time-editor",
-										name: "applicant-date-signed"
-									}
-								]
+									spacing: {
+										margin: "0px 0px 0px 0px",
+										padding: "0px 0px 0px 0px"
+									},
+									border: {
+										width: "1px",
+										radius: "0px",
+										color: "#000000",
+										style: "none"
+									},
+									direction: "ltr"
+								}
 							}
-						]
-					},
-					{
-						type: "grid-item-layout",
-						name: "supervisor-signature",
+						],
 						options: {
 							spacing: {
 								margin: "0px",
-								padding: "20px"
+								padding: "0px"
 							},
 							border: {
 								width: "1px",
-								radius: "8px",
-								color: "#e5e7eb",
-								style: "solid"
+								radius: "0px",
+								color: "#000000",
+								style: "none"
 							},
-							direction: "ltr",
-							colSpan: 4
-						},
+							flexWrap: "nowrap",
+							justifyContent: "center",
+							alignItems: "center",
+							gap: "20px"
+						}
+					}
+				]
+			},
+			{
+				type: "grid-item-layout",
+				name: "grid-item-layout29",
+				options: {
+					spacing: {
+						margin: "0px 0px 0px 0px",
+						padding: "0px 0px 0px 0px"
+					},
+					border: {
+						width: "1px",
+						radius: "0px",
+						color: "#000000",
+						style: "none"
+					},
+					direction: "ltr",
+					colSpan: 10
+				},
+				children: [
+					{
+						type: "flex-layout",
+						name: "flex-layout28",
 						children: [
 							{
-								type: "form-field",
-								options: {
-									label: "Supervisor Signature"
-								},
+								type: "flex-item-layout",
+								name: "flex-item-layout28",
 								children: [
 									{
-										type: "signature",
-										name: "supervisor-signature-field"
+										type: "text-block-layout",
+										name: "text-block-layout20",
+										options: {
+											content: "<p>Electrical Hazards (e.g. Electrocution from faulty tools or working close to power lines)</p>"
+										}
 									}
-								]
-							},
-							{
-								type: "form-field",
+								],
 								options: {
-									label: "Date"
-								},
-								children: [
-									{
-										type: "date-time-editor",
-										name: "supervisor-date-signed"
-									}
-								]
+									spacing: {
+										margin: "0px 0px 0px 0px",
+										padding: "0px 0px 0px 0px"
+									},
+									border: {
+										width: "1px",
+										radius: "0px",
+										color: "#000000",
+										style: "none"
+									},
+									direction: "ltr"
+								}
 							}
-						]
-					},
-					{
-						type: "grid-item-layout",
-						name: "safety-officer-signature",
+						],
 						options: {
 							spacing: {
 								margin: "0px",
-								padding: "20px"
+								padding: "10px"
 							},
 							border: {
 								width: "1px",
-								radius: "8px",
-								color: "#e5e7eb",
-								style: "solid"
+								radius: "0px",
+								color: "#000000",
+								style: "none"
 							},
-							direction: "ltr",
-							colSpan: 4
-						},
+							flexWrap: "nowrap",
+							justifyContent: "center",
+							alignItems: "center",
+							gap: "20px"
+						}
+					}
+				]
+			},
+			{
+				type: "grid-item-layout",
+				name: "grid-item-layout30",
+				options: {
+					spacing: {
+						margin: "0px 0px 0px 0px",
+						padding: "0px 0px 0px 0px"
+					},
+					border: {
+						width: "1px",
+						radius: "0px",
+						color: "#000000",
+						style: "none"
+					},
+					direction: "ltr",
+					colSpan: 2,
+					grid: {
+						"default": {
+							rows: 1,
+							columns: 1,
+							justifyItems: "stretch",
+							alignItems: "stretch",
+							gap: "0px 0px"
+						}
+					}
+				},
+				children: [
+					{
+						type: "flex-layout",
+						name: "flex-layout29",
 						children: [
 							{
-								type: "form-field",
-								options: {
-									label: "Safety Officer Signature"
-								},
+								type: "flex-item-layout",
+								name: "flex-item-layout29",
 								children: [
 									{
-										type: "signature",
-										name: "safety-officer-signature-field"
+										type: "selection-list-editor",
+										name: "selection-list-editor10",
+										path: "select-option-row-10",
+										options: {
+											multiple: false,
+											direction: {
+												id: "horizontal"
+											},
+											disabled: false,
+											readonly: false,
+											dataSource: "yes-no-options",
+											textField: "title",
+											valueField: "value"
+										}
 									}
-								]
-							},
-							{
-								type: "form-field",
+								],
 								options: {
-									label: "Date"
-								},
-								children: [
-									{
-										type: "date-time-editor",
-										name: "safety-officer-date-signed"
-									}
-								]
+									spacing: {
+										margin: "0px 0px 0px 0px",
+										padding: "0px 0px 0px 0px"
+									},
+									border: {
+										width: "1px",
+										radius: "0px",
+										color: "#000000",
+										style: "none"
+									},
+									direction: "ltr"
+								}
 							}
-						]
+						],
+						options: {
+							spacing: {
+								margin: "0px",
+								padding: "0px"
+							},
+							border: {
+								width: "1px",
+								radius: "0px",
+								color: "#000000",
+								style: "none"
+							},
+							flexWrap: "nowrap",
+							justifyContent: "center",
+							alignItems: "center",
+							gap: "20px"
+						}
 					}
 				]
 			}
@@ -32950,6 +34302,14 @@ const createFileCastMiddleware = {
                 return undefined;
             }
         })();
+        const folderService = (() => {
+            try {
+                return inject(AXMFolderService);
+            }
+            catch {
+                return undefined;
+            }
+        })();
         // Helper Functions
         const isFileListItem = (obj) => {
             // Must have name as string
@@ -33067,11 +34427,9 @@ const createFileCastMiddleware = {
                             return { id: docId, kind: 'document' };
                         }
                         catch (error) {
-                            console.warn(`[file-cast] ⚠️ Failed to create document for existing file, falling back to file`, { cleanFileId, error });
                         }
                     }
                     else {
-                        console.warn(`[file-cast] ⚠️ Document service unavailable; returning file reference`, { cleanFileId });
                     }
                 }
                 return { id: cleanFileId, kind: 'file' };
@@ -33166,13 +34524,69 @@ const createFileCastMiddleware = {
                 typeof m.name === 'string' && typeof m.title === 'string' && typeof m.value === 'string');
         };
         const ensureDocumentRecord = async (svc, payload) => {
-            // Try to insert a minimal document record. Other fields are optional in mock.
+            // Resolve or create folder hierarchy: <Entity>/<Record Title|Name>
+            let parentId;
+            try {
+                if (folderService) {
+                    const findFolderByName = async (name, parent) => {
+                        const filters = [
+                            { field: 'name', operator: { type: 'equal' }, value: name },
+                        ];
+                        if (parent) {
+                            filters.push({ field: 'parentId', operator: { type: 'equal' }, value: parent });
+                        }
+                        else {
+                            filters.push({ field: 'parentId', operator: { type: 'isnull' } });
+                        }
+                        const result = await folderService.query({
+                            skip: 0,
+                            take: 1,
+                            filter: { logic: 'and', filters },
+                        });
+                        return result?.items?.[0] ?? null;
+                    };
+                    const ensureFolder = async (name, parent) => {
+                        const exists = await findFolderByName(name, parent);
+                        if (exists?.id)
+                            return exists.id;
+                        const createPayload = {
+                            name,
+                            color: '#FFFFFF',
+                            size: 0,
+                            parentId: parent,
+                            inherit: 'Extends',
+                        };
+                        const newId = await folderService.insertOne(createPayload);
+                        return newId;
+                    };
+                    // Find a root (folder with no parent)
+                    const rootQuery = await folderService.query({
+                        skip: 0,
+                        take: 1,
+                        filter: { logic: 'and', filters: [{ field: 'parentId', operator: { type: 'isnull' } }] },
+                    });
+                    const root = rootQuery?.items?.[0];
+                    if (root?.id) {
+                        const entityFullName = ctx.entityName || 'Entity';
+                        const entityNameOnly = entityFullName.split('.').pop() || entityFullName;
+                        const recordFolderName = (ctx?.data?.title || ctx?.data?.name || payload.name || 'Record').toString();
+                        const entityFolderId = await ensureFolder(entityNameOnly, root.id);
+                        parentId = await ensureFolder(recordFolderName, entityFolderId);
+                    }
+                }
+            }
+            catch (e) {
+                // Fallback: if anything fails, we will try to insert without parentId; mock may reject
+                console.warn('[file-cast] ⚠️ Failed to ensure folder path for document, inserting without parentId');
+            }
+            // Insert document record with resolved parent folder if available
             const id = await svc.insertOne({
                 fileId: addFilePrefix(payload.fileId),
                 name: payload.name,
                 title: payload.title,
                 size: payload.size,
                 meta: payload.meta,
+                parentId,
             });
             return id;
         };