diff --git a/forms-flow-ai/epd-forms/bundling/Contaminated Sites Services Application Form.json b/forms-flow-ai/epd-forms/bundling/Contaminated Sites Services Application Form.json index 71f98aa5..37caaac2 100644 --- a/forms-flow-ai/epd-forms/bundling/Contaminated Sites Services Application Form.json +++ b/forms-flow-ai/epd-forms/bundling/Contaminated Sites Services Application Form.json @@ -465,10 +465,41 @@ "action": "custom", "showValidations": false, "theme": "warning", + "size": "md", + "block": false, + "leftIcon": "", + "rightIcon": "", + "shortcut": "", + "description": "", + "tooltip": "", + "customClass": "", + "tabindex": "", + "disableOnInvalid": false, + "hidden": false, + "autofocus": false, "disabled": true, "tableView": false, + "modalEdit": false, "key": "needsMoreInfo", - "customConditional": "const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"));\r\nconst roles = UserDetails[\"role\"];\r\nconst taskUrl = window.location.pathname.split('/');\r\nconst taskId = taskUrl[2];\r\nconst authToken = localStorage.getItem(\"authToken\");\r\nconst bpmUrl = localStorage.getItem(\"bpmApiUrl\");\r\nvar reqUrl = bpmUrl + \"/task/\" + taskId + \"/variables\";\r\n\r\n\r\n getData(reqUrl, authToken).then((response) => {\r\n \r\n\t if(roles.includes(\"formsflow-reviewer\")) {\r\n \tvar applicationStatus = response.applicationStatus ? response.applicationStatus.value : '';\r\n \t show = true;\r\n \t \r\n\r\n \t\t\r\n\t if (applicationStatus === 'Resubmit') {\r\n\t component.disabled = true;\r\n\t component.description = 'Disabled since SRCR resubmission in progress';\r\n\t instance.triggerRedraw();\r\n\t } else {\r\n\t component.description = '';\r\n\t component.disabled = false;\r\n\t instance.triggerRedraw();\r\n\t }\r\n\t }\r\n\t else\r\n\t {\r\n \t\tshow = false;\r\n\t }\r\n });\r\n\r\n\r\nasync function getData(reqUrl, authToken) {\r\n const response = await fetch(reqUrl, {\r\n method: \"GET\",\r\n headers: {\r\n \"Content-type\": \"application/json\",\r\n Accept: \"application/json\",\r\n Authorization: \"Bearer \" + authToken,\r\n },\r\n });\r\n const data = await response.json();\r\n return data;\r\n}", + "tags": [], + "properties": {}, + "conditional": { + "show": null, + "when": null, + "eq": "", + "json": "" + }, + "customConditional": "const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"));\r\nconst roles = UserDetails[\"role\"];\r\nconst taskUrl = window.location.pathname.split('/');\r\nconst taskId = taskUrl[2];\r\nconst authToken = localStorage.getItem(\"authToken\");\r\nconst bpmUrl = localStorage.getItem(\"bpmApiUrl\");\r\nvar reqUrl = bpmUrl + \"/task/\" + taskId + \"/variables\";\r\n\r\n\r\n getData(reqUrl, authToken).then((response) => {\r\n \r\n\t if(roles.includes(\"formsflow-reviewer\")) {\r\n \tvar applicationStatus = response.applicationStatus ? response.applicationStatus.value : '';\r\n\tvar isResubmitted = response.isSrcrResubmitted ? response.isSrcrResubmitted.value : false;\r\n\r\n \t show = true;\r\n \t \r\n\r\n \t\t\r\n\t if (isResubmitted) {\r\n\t component.disabled = true;\r\n\t component.description = 'Disabled since SRCR resubmission in progress';\r\n\t instance.triggerRedraw();\r\n\t } else {\r\n\t component.description = '';\r\n\t component.disabled = false;\r\n\t instance.triggerRedraw();\r\n\t }\r\n\t }\r\n\t else\r\n\t {\r\n \t\tshow = false;\r\n\t }\r\n });\r\n\r\n\r\nasync function getData(reqUrl, authToken) {\r\n const response = await fetch(reqUrl, {\r\n method: \"GET\",\r\n headers: {\r\n \"Content-type\": \"application/json\",\r\n Accept: \"application/json\",\r\n Authorization: \"Bearer \" + authToken,\r\n },\r\n });\r\n const data = await response.json();\r\n return data;\r\n}", + "logic": [], + "attributes": {}, + "overlay": { + "style": "", + "page": "", + "left": "", + "top": "", + "width": "", + "height": "" + }, "type": "button", "custom": "const submissionId = form._submission._id;\r\nconst formId = form._submission.form;\r\nconst formDataReqUrl = form.formio?form.formio.formUrl:(localStorage.getItem('customSubmissionUrl')+'/form/'+formId)+'/submission/'+submissionId;+submissionId;\r\nconst filteredData = _.pick(data, data.cssaUtilKeys);\r\nconst formDataReqObj1 = { \"_id\": submissionId, \"data\": filteredData};\r\nconst formio = new Formio(formDataReqUrl);\r\nformio.saveSubmission(formDataReqObj1).then( result => {\r\nform.emit('customEvent', {\r\n type: \"actionComplete\", \r\n component: component,\r\n actionType: 'Returned'\r\n }); \r\n}).catch((error)=>{\r\n//Error callback on not Save\r\nform.emit('customEvent', {\r\n type: \"actionError\", \r\n component: component,\r\n actionType:'Returned'\r\n }); \r\n});", "input": true, @@ -476,25 +507,18 @@ "keyModified": true, "placeholder": "", "prefix": "", - "customClass": "", "suffix": "", "multiple": false, "defaultValue": null, "protected": false, "unique": false, "persistent": false, - "hidden": false, "clearOnHide": true, "refreshOn": "", - "modalEdit": false, "dataGridLabel": true, "labelPosition": "top", - "description": "", "errorLabel": "", - "tooltip": "", "hideLabel": false, - "tabindex": "", - "autofocus": false, "dbIndex": false, "customDefaultValue": "", "calculateValue": "", @@ -502,7 +526,6 @@ "widget": { "type": "input" }, - "attributes": {}, "validateOn": "change", "validate": { "required": false, @@ -512,31 +535,13 @@ "multiple": false, "unique": false }, - "conditional": { - "show": null, - "when": null, - "eq": "" - }, - "overlay": { - "style": "", - "left": "", - "top": "", - "width": "", - "height": "" - }, "allowCalculateOverride": false, "encrypted": false, "showCharCount": false, "showWordCount": false, - "properties": {}, "allowMultipleMasks": false, "addons": [], - "size": "md", - "leftIcon": "", - "rightIcon": "", - "block": false, - "disableOnInvalid": false, - "id": "ewzp0gq" + "id": "e7zbnrio" } ], "size": "md", @@ -7612,7 +7617,7 @@ "addons": [], "tree": false, "lazyLoad": false, - "id": "ehmz9lv" + "id": "ehmz9lv0000" } ], "placeholder": "", @@ -9255,7 +9260,7 @@ } ], "collapsible": false, - "id": "ewhx8sm", + "id": "ewhx8sm0000", "placeholder": "", "prefix": "", "customClass": "", @@ -18423,7 +18428,7 @@ }, "inputMask": "999-999-999", "tableView": true, - "id": "elva88", + "id": "elva880000", "placeholder": "", "prefix": "", "customClass": "", @@ -18503,7 +18508,7 @@ "tableView": true, "autoExpand": true, "inputFormat": "plain", - "id": "ey48nu", + "id": "ey48nu0000", "placeholder": "", "prefix": "", "customClass": "", @@ -18878,7 +18883,7 @@ "input": true, "label": "PIN", "tableView": true, - "id": "eyxe45n", + "id": "eyxe45n0000", "placeholder": "", "prefix": "", "customClass": "", @@ -18971,7 +18976,7 @@ "autoExpand": true, "inputFormat": "plain", "placeholder": "example, metes and bounds", - "id": "efdcvf", + "id": "efdcvf0000", "prefix": "", "customClass": "", "suffix": "", @@ -19185,7 +19190,7 @@ "input": true, "label": "Crown Land File Numbers", "tableView": true, - "id": "emf4u7g", + "id": "emf4u7g0000", "placeholder": "", "prefix": "", "customClass": "", @@ -20237,7 +20242,7 @@ }, "inputMask": "999-999-999", "tableView": true, - "id": "ev43oe9", + "id": "ev43oe90000", "placeholder": "", "prefix": "", "customClass": "", @@ -20317,7 +20322,7 @@ "tableView": true, "autoExpand": true, "inputFormat": "plain", - "id": "eb3d0l", + "id": "eb3d0l0000", "placeholder": "", "prefix": "", "customClass": "", @@ -20692,7 +20697,7 @@ "input": true, "label": "PIN", "tableView": true, - "id": "eyv4fcu", + "id": "eyv4fcu0000", "placeholder": "", "prefix": "", "customClass": "", @@ -20785,7 +20790,7 @@ "autoExpand": true, "inputFormat": "plain", "placeholder": "example, metes and bounds", - "id": "ecgeub", + "id": "ecgeub0000", "prefix": "", "customClass": "", "suffix": "", @@ -20999,7 +21004,7 @@ "input": true, "label": "Crown Land File Numbers", "tableView": true, - "id": "eguyyh", + "id": "eguyyh0000", "placeholder": "", "prefix": "", "customClass": "", diff --git a/forms-flow-ai/epd-forms/bundling/Detailed Ecological Risk Assessment Checklist.json b/forms-flow-ai/epd-forms/bundling/Detailed Ecological Risk Assessment Checklist.json index 9f22932a..f8a7cea2 100644 --- a/forms-flow-ai/epd-forms/bundling/Detailed Ecological Risk Assessment Checklist.json +++ b/forms-flow-ai/epd-forms/bundling/Detailed Ecological Risk Assessment Checklist.json @@ -392,7 +392,7 @@ "eq": "", "json": "" }, - "customConditional": "const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"));\r\nconst roles = UserDetails[\"role\"];\r\nconst taskUrl = window.location.pathname.split('/');\r\nconst taskId = taskUrl[2];\r\nconst authToken = localStorage.getItem(\"authToken\");\r\nconst bpmUrl = localStorage.getItem(\"bpmApiUrl\");\r\nvar reqUrl = bpmUrl + \"/task/\" + taskId + \"/variables\";\r\n\r\n\r\n getData(reqUrl, authToken).then((response) => {\r\n \r\n\t if(roles.includes(\"formsflow-reviewer\")) {\r\n \tvar applicationStatus = response.applicationStatus ? response.applicationStatus.value : '';\r\n \t show = true;\r\n \t \r\n\r\n \t\t\r\n\t if (applicationStatus === 'Resubmit') {\r\n\t component.disabled = true;\r\n\t component.description = 'Disabled since SRCR resubmission in progress';\r\n\t instance.triggerRedraw();\r\n\t } else {\r\n\t component.description = '';\r\n\t component.disabled = false;\r\n\t instance.triggerRedraw();\r\n\t }\r\n\t }\r\n\t else\r\n\t {\r\n \t\tshow = false;\r\n\t }\r\n });\r\n\r\n\r\nasync function getData(reqUrl, authToken) {\r\n const response = await fetch(reqUrl, {\r\n method: \"GET\",\r\n headers: {\r\n \"Content-type\": \"application/json\",\r\n Accept: \"application/json\",\r\n Authorization: \"Bearer \" + authToken,\r\n },\r\n });\r\n const data = await response.json();\r\n return data;\r\n}", + "customConditional": "const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"));\r\nconst roles = UserDetails[\"role\"];\r\nconst taskUrl = window.location.pathname.split('/');\r\nconst taskId = taskUrl[2];\r\nconst authToken = localStorage.getItem(\"authToken\");\r\nconst bpmUrl = localStorage.getItem(\"bpmApiUrl\");\r\nvar reqUrl = bpmUrl + \"/task/\" + taskId + \"/variables\";\r\n\r\n\r\n getData(reqUrl, authToken).then((response) => {\r\n \r\n\t if(roles.includes(\"formsflow-reviewer\")) {\r\n \tvar applicationStatus = response.applicationStatus ? response.applicationStatus.value : '';\r\n\tvar isResubmitted = response.isSrcrResubmitted ? response.isSrcrResubmitted.value : false;\r\n \t show = true;\r\n \t \r\n\r\n \t\t\r\n\t if (isResubmitted) {\r\n\t component.disabled = true;\r\n\t component.description = 'Disabled since SRCR resubmission in progress';\r\n\t instance.triggerRedraw();\r\n\t } else {\r\n\t component.description = '';\r\n\t component.disabled = false;\r\n\t instance.triggerRedraw();\r\n\t }\r\n\t }\r\n\t else\r\n\t {\r\n \t\tshow = false;\r\n\t }\r\n });\r\n\r\n\r\nasync function getData(reqUrl, authToken) {\r\n const response = await fetch(reqUrl, {\r\n method: \"GET\",\r\n headers: {\r\n \"Content-type\": \"application/json\",\r\n Accept: \"application/json\",\r\n Authorization: \"Bearer \" + authToken,\r\n },\r\n });\r\n const data = await response.json();\r\n return data;\r\n}", "logic": [], "attributes": {}, "overlay": { @@ -444,7 +444,7 @@ "showWordCount": false, "allowMultipleMasks": false, "addons": [], - "id": "ef22dsd" + "id": "eozzsx" } ], "size": "md", @@ -5488,7 +5488,7 @@ "attributes": {}, "components": [ { - "id": "eh8z2bfa0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "eh8z2bfa0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "key": "panel", "tags": [], "tree": false, @@ -36017,7 +36017,7 @@ } ], "collapsible": false, - "id": "eof79400000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "eof79400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", diff --git a/forms-flow-ai/epd-forms/bundling/Site Risk Classification Report.json b/forms-flow-ai/epd-forms/bundling/Site Risk Classification Report.json index 5a92fac7..09bd5e22 100644 --- a/forms-flow-ai/epd-forms/bundling/Site Risk Classification Report.json +++ b/forms-flow-ai/epd-forms/bundling/Site Risk Classification Report.json @@ -1195,7 +1195,7 @@ "eq": "", "json": "" }, - "customConditional": "const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"));\r\nconst roles = UserDetails[\"role\"];\r\nconst taskUrl = window.location.pathname.split('/');\r\nconst taskId = taskUrl[2];\r\nconst authToken = localStorage.getItem(\"authToken\");\r\nconst bpmUrl = localStorage.getItem(\"bpmApiUrl\");\r\nvar reqUrl = bpmUrl + \"/task/\" + taskId + \"/variables\";\r\n\r\n getData(reqUrl, authToken).then((response) => {\r\n \r\n \t\t var applicationStatus = response.applicationStatus?response.applicationStatus.value:'';\r\n\t if(response.deraStatus && response.deraStatus.value === 'Returned'){\r\n \t\t component.disabled = true;\r\n\t component.description = 'Disabled since DERA resubmission in progress';\r\n\t instance.triggerRedraw();\r\n\r\n\t }\r\n\t else if (applicationStatus === 'Resubmit') {\r\n\r\n\t component.disabled = true;\r\n\t component.description = 'Disabled since CSSA resubmission in progress';\r\n\t instance.triggerRedraw();\r\n\t } else {\r\n\t component.description = '';\r\n\t component.disabled = false;\r\n\t instance.triggerRedraw();\r\n\t }\r\n\t \r\n });\r\n\r\n\r\nasync function getData(reqUrl, authToken) {\r\n const response = await fetch(reqUrl, {\r\n method: \"GET\",\r\n headers: {\r\n \"Content-type\": \"application/json\",\r\n Accept: \"application/json\",\r\n Authorization: \"Bearer \" + authToken,\r\n },\r\n });\r\n const data = await response.json();\r\n return data;\r\n}", + "customConditional": "const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"));\r\nconst roles = UserDetails[\"role\"];\r\nconst taskUrl = window.location.pathname.split('/');\r\nconst taskId = taskUrl[2];\r\nconst authToken = localStorage.getItem(\"authToken\");\r\nconst bpmUrl = localStorage.getItem(\"bpmApiUrl\");\r\nvar reqUrl = bpmUrl + \"/task/\" + taskId + \"/variables\";\r\n\r\n getData(reqUrl, authToken).then((response) => {\r\n \r\n \t\t var applicationStatus = response.applicationStatus?response.applicationStatus.value:'';\r\n\t\t var isCssaResubmitted = response.isCssaResubmitted?response.isCssaResubmitted.value:false;\r\n \t\t var isDeraResubmitted = response.isDeraResubmitted?response.isDeraResubmitted.value:false;\r\n\r\n\t if(isDeraResubmitted){\r\n \t\t component.disabled = true;\r\n\t component.description = 'Disabled since DERA resubmission in progress';\r\n\t instance.triggerRedraw();\r\n\r\n\t }\r\n\t else if (isCssaResubmitted) {\r\n\r\n\t component.disabled = true;\r\n\t component.description = 'Disabled since CSSA resubmission in progress';\r\n\t instance.triggerRedraw();\r\n\t } else {\r\n\t component.description = '';\r\n\t component.disabled = false;\r\n\t instance.triggerRedraw();\r\n\t }\r\n\t \r\n });\r\n\r\n\r\nasync function getData(reqUrl, authToken) {\r\n const response = await fetch(reqUrl, {\r\n method: \"GET\",\r\n headers: {\r\n \"Content-type\": \"application/json\",\r\n Accept: \"application/json\",\r\n Authorization: \"Bearer \" + authToken,\r\n },\r\n });\r\n const data = await response.json();\r\n return data;\r\n}", "logic": [], "attributes": {}, "overlay": { @@ -1246,7 +1246,7 @@ "showWordCount": false, "allowMultipleMasks": false, "addons": [], - "id": "epaslsk" + "id": "e6wka93" } ], "size": "md", @@ -5069,7 +5069,7 @@ "attributes": {}, "components": [ { - "id": "ele95t000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "ele95t00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "key": "spropertyOwnerAndOrOperator", "tree": false, "type": "panel", @@ -14481,7 +14481,7 @@ "attributes": {}, "components": [ { - "id": "eks0gu00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "eks0gu0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "key": "exposurePathwayQuestionnaireAffectedParcel", "tree": false, "type": "panel", @@ -18424,7 +18424,7 @@ } ], "collapsible": false, - "id": "eo5mwyp000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "eo5mwyp00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", diff --git a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/CSSABundleWorklow.bpmn b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/CSSABundleWorklow.bpmn index c41cc175..dd7e31c7 100644 --- a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/CSSABundleWorklow.bpmn +++ b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/CSSABundleWorklow.bpmn @@ -1,5 +1,5 @@ - + @@ -585,12 +585,13 @@ system.out.println ("isSentFromSociety "+execution.getVariable('isSentFromSociet execution.setVariable('applicationStatus', "Resubmitted"); execution.setVariable('requestStatus', "Resubmitted"); -execution.setVariable('cssaStatus', "Resubmitted"); +execution.setVariable('cssaStatus', "Resubmitted"); +execution.setVariable('isCssaResubmitted', false); - ["applicationId", "applicationStatus", "cssaStatus"] + ["applicationId", "applicationStatus", "cssaStatus","isCssaResubmitted"] @@ -618,6 +619,14 @@ execution.setVariable('cssaStatus', "Resubmitted"); + + execution.setVariable('isCssaResubmitted', true); + + + + ["applicationId", "applicationStatus", "isCssaResubmitted"] + + ${action == 'Returned'} @@ -666,6 +675,14 @@ execution.setVariable('cssaStatus', "Resubmitted"); + + execution.setVariable('isCssaResubmitted', true); + + + + ["applicationId", "applicationStatus", "isCssaResubmitted"] + + ${action == 'Returned'} @@ -675,11 +692,12 @@ execution.setVariable('cssaStatus', "Resubmitted"); execution.setVariable('applicationStatus', "Resubmitted"); execution.setVariable('requestStatus', "Resubmitted"); -execution.setVariable('cssaStatus', "Resubmitted"); +execution.setVariable('cssaStatus', "Resubmitted"); +execution.setVariable('isCssaResubmitted', false); - ["applicationId", "applicationStatus", "cssaStatus"] + ["applicationId", "applicationStatus", "cssaStatus","isCssaResubmitted"] @@ -947,11 +965,12 @@ task.execution.setVariable('subFormName','SRCR Form'); execution.setVariable('applicationStatus', "Resubmitted"); execution.setVariable('requestStatus', "Resubmitted"); -execution.setVariable('srcrStatus', "Resubmitted"); +execution.setVariable('srcrStatus', "Resubmitted"); +execution.setVariable('isSrcrResubmitted', false); - ["applicationId", "applicationStatus", "srcrStatus"] + ["applicationId", "applicationStatus", "srcrStatus","isSrcrResubmitted"] @@ -1004,6 +1023,14 @@ execution.setVariable('srcrStatus', "Resubmitted"); + + execution.setVariable('isSrcrResubmitted', true); + + + + ["applicationId", "applicationStatus", "isSrcrResubmitted"] + + ${action == 'Returned' } @@ -1012,12 +1039,13 @@ execution.setVariable('srcrStatus', "Resubmitted"); execution.setVariable('applicationStatus', "Resubmitted"); execution.setVariable('requestStatus', "Resubmitted"); -execution.setVariable('srcrStatus', "Resubmitted"); +execution.setVariable('srcrStatus', "Resubmitted"); +execution.setVariable('isSrcrResubmitted', false); - ["applicationId", "applicationStatus", "srcrStatus"] + ["applicationId", "applicationStatus", "srcrStatus","isSrcrResubmitted"] @@ -1058,6 +1086,14 @@ execution.setVariable('srcrStatus', "Resubmitted"); + + execution.setVariable('isSrcrResubmitted', true); + + + + ["applicationId", "applicationStatus", "isSrcrResubmitted"] + + ${action == 'Returned' } @@ -1078,11 +1114,12 @@ execution.setVariable('srcrStatus', "Resubmitted"); execution.setVariable('applicationStatus', "Resubmitted"); execution.setVariable('requestStatus', "Resubmitted"); -execution.setVariable('srcrStatus', "Resubmitted"); +execution.setVariable('srcrStatus', "Resubmitted"); +execution.setVariable('isSrcrResubmitted', false); - ["applicationId", "applicationStatus", "srcrStatus"] + ["applicationId", "applicationStatus", "srcrStatus", "isSrcrResubmitted"] @@ -1131,6 +1168,14 @@ execution.setVariable('requestType', 'SRCR'); + + execution.setVariable('isSrcrResubmitted', true); + + + + ["applicationId", "applicationStatus", "isSrcrResubmitted"] + + ${action == 'Returned' } @@ -1565,707 +1610,510 @@ task.execution.setVariable('userRole','CSSA Team'); - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - + - - - - + + + + + + - + - - - - - - + + + + + + + + + - + - - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - + + + - + - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - - - - + + + - + - - - - - + + + + + + - + - - - - - - - - - - + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - + + + - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + - - - - - - - + + + - + - - - - - + + + + + - + - - - - - - - - - - - + + + - - - + + + - - - + + + - + - - - - - + + + + + - + - - - - - + + + - + - - - - - - - - - + + + + + - + - - - + + + - + - - - - - - - + + + - - - - + + + - + - - - + + + + - + - - - - - - - + + + - - - - - - + + + - - - + + + - - - - - - - - + + + + - - - - - - - - + + + - - - - - - - + + + + - - - - - - + + + + - - - + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - + - - - - - - - - + + + - + - - - - - - + + - - + + + + + - + - - + + - - + + - + - - - - - + + + - - + + - + - - + + - - - + + + + + - - + + - + - - + + - + - - + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + - - - + + + + + + - - - + + + - - - + + + - - - - + + + + + - + - - - + + + - + - - - - - - - + + + + + - + - - - - - + + + + - + - - - + + + + - + - - - - - + + + + + - + - - - + + + + + - + - - - + + + - - - + + + - - - - - + + + - + - - - + + + + - + - - - + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - + - - - + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - + + + - - - - - - - - + + + - - - + + + - + - - - + + + - + @@ -2277,275 +2125,66 @@ task.execution.setVariable('userRole','CSSA Team'); - - - + + + - + - - - + + + - + - - - - - - - - - - - - - - - + + + + - + - - - - - - + + + - - - - - - - - + + + + - - - - - - - + + + - - - - - - + + + + - - - + + + - - - + + + - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + @@ -2655,6 +2294,413 @@ task.execution.setVariable('userRole','CSSA Team'); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/DERABundleWorkflow.bpmn b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/DERABundleWorkflow.bpmn index 4f68aa08..04071c28 100644 --- a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/DERABundleWorkflow.bpmn +++ b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/DERABundleWorkflow.bpmn @@ -1,5 +1,5 @@ - + @@ -522,12 +522,13 @@ system.out.println ("isSentFromSociety "+execution.getVariable('isSentFromSociet execution.setVariable('applicationStatus', "Resubmitted"); execution.setVariable('requestStatus', "Resubmitted"); -execution.setVariable('deraStatus', "Resubmitted"); +execution.setVariable('deraStatus', "Resubmitted"); +execution.setVariable('isDeraResubmitted', false); - ["applicationId", "applicationStatus", "deraStatus"] + ["applicationId", "applicationStatus", "deraStatus","isDeraResubmitted"] @@ -555,6 +556,14 @@ execution.setVariable('deraStatus', "Resubmitted"); + + execution.setVariable('isDeraResubmitted', true); + + + + ["applicationId", "applicationStatus", "isDeraResubmitted"] + + ${action == 'Returned'} @@ -603,6 +612,14 @@ execution.setVariable('deraStatus', "Resubmitted"); + + execution.setVariable('isDeraResubmitted', true); + + + + ["applicationId", "applicationStatus", "isDeraResubmitted"] + + ${action == 'Returned'} @@ -612,11 +629,12 @@ execution.setVariable('deraStatus', "Resubmitted"); execution.setVariable('applicationStatus', "Resubmitted"); execution.setVariable('requestStatus', "Resubmitted"); -execution.setVariable('deraStatus', "Resubmitted"); +execution.setVariable('deraStatus', "Resubmitted"); +execution.setVariable('isDeraResubmitted', false); - ["applicationId", "applicationStatus", "deraStatus"] + ["applicationId", "applicationStatus", "deraStatus","isDeraResubmitted"] @@ -1091,11 +1109,12 @@ task.execution.setVariable('subFormName','SRCR Form'); execution.setVariable('applicationStatus', "Resubmitted"); execution.setVariable('requestStatus', "Resubmitted"); -execution.setVariable('srcrStatus', "Resubmitted"); +execution.setVariable('srcrStatus', "Resubmitted"); +execution.setVariable('isSrcrResubmitted', false); - ["applicationId", "applicationStatus", "srcrStatus"] + ["applicationId", "applicationStatus", "srcrStatus","isSrcrResubmitted"] @@ -1148,6 +1167,14 @@ execution.setVariable('srcrStatus', "Resubmitted"); + + execution.setVariable('isSrcrResubmitted', true); + + + + ["applicationId", "applicationStatus", "isSrcrResubmitted"] + + ${action == 'Returned' } @@ -1156,12 +1183,13 @@ execution.setVariable('srcrStatus', "Resubmitted"); execution.setVariable('applicationStatus', "Resubmitted"); execution.setVariable('requestStatus', "Resubmitted"); -execution.setVariable('srcrStatus', "Resubmitted"); +execution.setVariable('srcrStatus', "Resubmitted"); +execution.setVariable('isSrcrResubmitted', false); - ["applicationId", "applicationStatus", "srcrStatus"] + ["applicationId", "applicationStatus", "srcrStatus","isSrcrResubmitted"] @@ -1202,6 +1230,14 @@ execution.setVariable('srcrStatus', "Resubmitted"); + + execution.setVariable('isSrcrResubmitted', true); + + + + ["applicationId", "applicationStatus", "isSrcrResubmitted"] + + ${action == 'Returned' } @@ -1222,11 +1258,12 @@ execution.setVariable('srcrStatus', "Resubmitted"); execution.setVariable('applicationStatus', "Resubmitted"); execution.setVariable('requestStatus', "Resubmitted"); -execution.setVariable('srcrStatus', "Resubmitted"); +execution.setVariable('srcrStatus', "Resubmitted"); +execution.setVariable('isSrcrResubmitted', false); - ["applicationId", "applicationStatus", "srcrStatus"] + ["applicationId", "applicationStatus", "srcrStatus","isSrcrResubmitted"] @@ -1275,6 +1312,14 @@ execution.setVariable('requestType', 'SRCR'); + + execution.setVariable('isSrcrResubmitted', true); + + + + ["applicationId", "applicationStatus", "isSrcrResubmitted"] + + ${action == 'Returned' } @@ -1451,1060 +1496,1060 @@ execution.setVariable("applicationStatus", "Rejected"); - - - - - + + + + + + + + + + + + + + + + - + - - - - - - + + + - + - - - - - + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + - - - - + + + - + - - - - - - + + + + + + - + - - - - - - - - - - - - + + + + + + + + + - + - - - - - - - - - - + + + - + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + - + - - - - + + + + + - + - - - - + + + - - - - + + + + + + + - + - - - - - - - - + + + + + - + - - - - - - - - - + + + - + - - - - - - - - - - - + + + + + + + + - - - - - + + + - + - - - + + + - - - + + + - + - - - - - + + + + - + - - - - - - - - - - - + + + - - - + + + - - - - - - + + + - - - - - - - - + + + - - - - - - - - + + + - - - + + + - - - - - - - - + + + + + - - - + + - + - - - - - + + + + + + + + + + + - + - - - - - + + + + + + + + + - + - - - - + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - - - - - - + + + - + - - - - + + + + + + - + - - - - - - + + + + + + + + + + + + + + + + + + + + - + - - - - - + + + + + + + + + - + - - - - - - - - + + + - + - - - - - - - - - - + + - - + + - - + + - + - - + + + + + - + - - + + - - - + + + + + - - + + - - + + - + - - - + + + + + - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - + - - - + + + + - + - - - - - - - + + + - + - - - - - + + + + + + + + + + + + + - + - - - + + + - + - - - - - + + + + + - + - - - + + + + - + - - - + + + + + + + - - - + + + + + + + + - - - - - + + + + + - + - - - + + + + + + + + + + + - + - - - + + + + - + - - - - - - - - - - - + + + + + - + - - - + + + + - + - - - - - - + + + + + - + - - - - - - - - - + + + + + + + + + + + + + + + + - + - - - + + + + - + - - - - - - - - - - - - - - - - + + + + + + - + - - - - - - - - - - - + + + + - + - - - - - - - - - + + + + - + - - - - - - + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - + + + + + + + - - - + + + - - - + + + + - - - + + + - - - - - + + - + - - - - + + + + + + + + + - + - - - - + + + + + + + + + + + - + - - - - - - - - + + + - - - + + + + - + - - - + + + + + - + - - - - - - - - - - - - - - - - + + + - + - - - + + + + + - + - - - - - + + + + + - + - - - - - - - + + + - - - + + + - + - - - + + + - - - + + + - - - - - + + + - + - - - - - + + + + - + - - - - + + + + - + - - - - + + + - + - - - - - + + + + + - + - - - + + + + + + + + + - + - - - - - + + + + + - + - - - + + + + + + - - - + + + - - - + + + + + + + + + + + + + + + + + - + - - - - + + + - + - - - - + + + + + + + + + - + - - - - - - - - - + + + + + + + + + + + + + + + + + - + - - - - - - - - - + + + + + + + + - + - - - + + + + + + + + + + - + - - - - - - - - - + + + + + + + + + + - + - - - - - - + + + + - + - - - - - - - + + + + + + + + + + - + - - - - - - - + + + + + + + + - + - - - + + + + + + + + + + + + + + - + - - - + + + + - + - - - - - - - - - - - - - - - - - - - + + + + + + - + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - + + + + + + + + + + + + + + + + + + +