Skip to content

Commit

Permalink
Merge pull request #706 from bcgov/feat/srs-365a
Browse files Browse the repository at this point in the history 
changes for fixing 365
  • Loading branch information
@midhun-aot
midhun-aot authored Jun 5, 2024
2 parents d33e564 + 020d6c7 commit 87af4a4
Show file tree
Hide file tree
Showing 2 changed files with 160 additions and 7 deletions.
154 changes: 148 additions & 6 deletions forms-flow-ai/epd-forms/bundling/Site Risk Classification Report.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5294,7 +5294,7 @@
"attributes": {},
"components": [
{
"id": "ele95t000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"id": "ele95t0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"key": "spropertyOwnerAndOrOperator",
"tree": false,
"type": "panel",
Expand Down Expand Up @@ -13601,8 +13601,8 @@
"type": "simple",
"simple": {
"show": true,
"when": "applicationStatus",
"eq": "Resubmit"
"when": "nomStatus",
"eq": "true"
}
},
"actions": [
Expand Down Expand Up @@ -13645,7 +13645,7 @@
"addons": [],
"inputType": "radio",
"fieldSet": false,
"id": "erkkev6o",
"id": "ezhj51l",
"defaultValue": ""
}
],
Expand Down Expand Up @@ -14767,7 +14767,7 @@
"attributes": {},
"components": [
{
"id": "eks0gu00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"id": "eks0gu000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"key": "exposurePathwayQuestionnaireAffectedParcel",
"tree": false,
"type": "panel",
Expand Down Expand Up @@ -18710,7 +18710,7 @@
}
],
"collapsible": false,
"id": "eo5mwyp000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"id": "eo5mwyp0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"placeholder": "",
"prefix": "",
"customClass": "",
Expand Down Expand Up @@ -19885,6 +19885,77 @@
"inputType": "hidden",
"id": "e12wr4"
},
{
"label": "nomStatus",
"customClass": "",
"modalEdit": false,
"defaultValue": null,
"persistent": true,
"protected": false,
"dbIndex": false,
"encrypted": false,
"redrawOn": "",
"customDefaultValue": "",
"calculateValue": "if (data.applicationStatus === 'Resubmit')\r\n{\r\n\tif (data.nomBundleStatus === 'SIA Returned')\r\n\t\tvalue = false;\r\n\telse\r\n\t\tvalue = true;\r\n}",
"calculateServer": false,
"key": "nomStatus",
"tags": [],
"properties": {},
"logic": [],
"attributes": {},
"overlay": {
"style": "",
"page": "",
"left": "",
"top": "",
"width": "",
"height": ""
},
"type": "hidden",
"input": true,
"tableView": false,
"placeholder": "",
"prefix": "",
"suffix": "",
"multiple": false,
"unique": false,
"hidden": false,
"clearOnHide": true,
"refreshOn": "",
"dataGridLabel": false,
"labelPosition": "top",
"description": "",
"errorLabel": "",
"tooltip": "",
"hideLabel": false,
"tabindex": "",
"disabled": false,
"autofocus": false,
"widget": {
"type": "input"
},
"validateOn": "change",
"validate": {
"required": false,
"custom": "",
"customPrivate": false,
"strictDateValidation": false,
"multiple": false,
"unique": false
},
"conditional": {
"show": null,
"when": null,
"eq": ""
},
"allowCalculateOverride": false,
"showCharCount": false,
"showWordCount": false,
"allowMultipleMasks": false,
"addons": [],
"inputType": "hidden",
"id": "ec59bk8"
},
{
"label": "srcrBundleStatus",
"customClass": "",
Expand Down Expand Up @@ -19956,6 +20027,77 @@
"inputType": "hidden",
"id": "ec2f3y"
},
{
"label": "nomBundleStatus",
"customClass": "",
"modalEdit": false,
"defaultValue": null,
"persistent": true,
"protected": false,
"dbIndex": false,
"encrypted": false,
"redrawOn": "",
"customDefaultValue": "",
"calculateValue": "",
"calculateServer": false,
"key": "nomBundleStatus",
"tags": [],
"properties": {},
"logic": [],
"attributes": {},
"overlay": {
"style": "",
"page": "",
"left": "",
"top": "",
"width": "",
"height": ""
},
"type": "hidden",
"input": true,
"tableView": false,
"placeholder": "",
"prefix": "",
"suffix": "",
"multiple": false,
"unique": false,
"hidden": false,
"clearOnHide": true,
"refreshOn": "",
"dataGridLabel": false,
"labelPosition": "top",
"description": "",
"errorLabel": "",
"tooltip": "",
"hideLabel": false,
"tabindex": "",
"disabled": false,
"autofocus": false,
"widget": {
"type": "input"
},
"validateOn": "change",
"validate": {
"required": false,
"custom": "",
"customPrivate": false,
"strictDateValidation": false,
"multiple": false,
"unique": false
},
"conditional": {
"show": null,
"when": null,
"eq": ""
},
"allowCalculateOverride": false,
"showCharCount": false,
"showWordCount": false,
"allowMultipleMasks": false,
"addons": [],
"inputType": "hidden",
"id": "er6rd99"
},
{
"label": "srcrUtilKeys",
"customClass": "",
Expand Down
13 changes: 12 additions & 1 deletion ...w-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/NOMBundleWorkflow.bpmn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,16 @@ task.execution.setVariable('userRole','Site Information Advisor');</camunda:scri
</bpmn:sequenceFlow>
<bpmn:sequenceFlow id="Flow_0unffch" name="Owner Submits" sourceRef="Activity_1ozfgid" targetRef="Gateway_0vt72pb" />
<bpmn:sequenceFlow id="Flow_1ua4w6m" name="Need Info" sourceRef="Activity_06nypz0" targetRef="Gateway_1pd38qv">
<bpmn:extensionElements>
<camunda:executionListener event="take">
<camunda:script scriptFormat="javascript">execution.setVariable('nomBundleStatus', "SIA Returned");</camunda:script>
</camunda:executionListener>
<camunda:executionListener class="org.camunda.bpm.extension.hooks.listeners.BPMFormDataPipelineListener" event="take">
<camunda:field name="fields">
<camunda:string>["applicationId", "applicationStatus", "nomBundleStatus"]</camunda:string>
</camunda:field>
</camunda:executionListener>
</bpmn:extensionElements>
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${action == 'Returned'}</bpmn:conditionExpression>
</bpmn:sequenceFlow>
<bpmn:sequenceFlow id="Flow_1oam11w" name="Accepted/Approved" sourceRef="Activity_06nypz0" targetRef="Gateway_15uoiyo">
Expand Down Expand Up @@ -738,6 +748,7 @@ system.out.println ("srcoAssignment"+execution.getVariable('srcoAssignment'));
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${action == 'Accepted'}</bpmn:conditionExpression>
</bpmn:sequenceFlow>
<bpmn:sequenceFlow id="Flow_0gzrwfr" name="Recheck" sourceRef="Gateway_06j5m9d" targetRef="Activity_06nypz0">
<bpmn:extensionElements />
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${action == 'Recheck'}</bpmn:conditionExpression>
</bpmn:sequenceFlow>
<bpmn:callActivity id="Activity_0yw5we4" name="Create BC Box Bucket &#38; Notify" calledElement="create-bucket">
Expand Down Expand Up @@ -1360,4 +1371,4 @@ execution.setVariable('returnedBy', "cssaTeam");</camunda:script>
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</bpmn:definitions>
</bpmn:definitions>

0 comments on commit 87af4a4

Please sign in to comment.