From fb77f48448e98fc615df5f649aed39f0f06ba610 Mon Sep 17 00:00:00 2001 From: Naveen Date: Fri, 26 May 2023 14:05:29 +0530 Subject: [PATCH 01/43] added config --- .../health/field-app-configuration.json | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/data/default/health/field-app-configuration.json b/data/default/health/field-app-configuration.json index ebd8e99b4..31636e765 100644 --- a/data/default/health/field-app-configuration.json +++ b/data/default/health/field-app-configuration.json @@ -8,12 +8,28 @@ "SYNC_METHOD": "API | OPLOG_UPLOAD", "SYNC_TRIGGER": "MANUAL | NETWORK_AVAILABLE", "TENANT_ID": "default", + "BACKGROUND_SERVICE_CONFIG": { + "BATTERY_PERCENT_CUT_OFF": 10, + "SERVICE_INTERVAL": 500 + }, + "BANDWIDTH_BATCH_SIZE": [ + { + "MIN_RANGE": 0.02, + "MAX_RANGE": 0.20, + "BATCH_SIZE": 1 + }, + { + "MIN_RANGE": 0.20, + "MAX_RANGE": 0.50, + "BATCH_SIZE": 5 + } + ], "LANGUAGES": [ { "label": "Portuguese", "value": "pt_MZ" }, - { + { "label": "French", "value": "fr_MZ" }, @@ -22,12 +38,12 @@ "value": "en_MZ" } ], - "CALL_SUPPORT":[ + "CALL_SUPPORT": [ { "name": "Support DeskLine 1", "code": "9686151676" }, - { + { "name": "Support DeskLine 2", "code": "7060431109" } @@ -405,4 +421,4 @@ } } ] -} +} \ No newline at end of file From 2baabd1873ab6a939ef0da43d5ff3d9d750eb2a3 Mon Sep 17 00:00:00 2001 From: Naveen Date: Fri, 26 May 2023 14:31:08 +0530 Subject: [PATCH 02/43] added api to check bandwidth --- data/default/health/service-registry.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/data/default/health/service-registry.json b/data/default/health/service-registry.json index 572cafdd2..dd2e6e8a5 100644 --- a/data/default/health/service-registry.json +++ b/data/default/health/service-registry.json @@ -406,6 +406,16 @@ "path": "/pgr-services/v2/request/_create" } ] + }, + { + "service": "BANDWIDTH-CHECK", + "actions": [ + { + "action": "bandwidth", + "entityName": "InternetSpeed", + "path": "/project/check/bandwidth" + } + ] } ] } From 919716e0a4785875a6a4ca793d05a27d742bfeab Mon Sep 17 00:00:00 2001 From: Naveen Date: Mon, 29 May 2023 10:05:21 +0530 Subject: [PATCH 03/43] added API concurrency --- data/default/health/field-app-configuration.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/default/health/field-app-configuration.json b/data/default/health/field-app-configuration.json index 31636e765..616d6799c 100644 --- a/data/default/health/field-app-configuration.json +++ b/data/default/health/field-app-configuration.json @@ -10,7 +10,8 @@ "TENANT_ID": "default", "BACKGROUND_SERVICE_CONFIG": { "BATTERY_PERCENT_CUT_OFF": 10, - "SERVICE_INTERVAL": 500 + "SERVICE_INTERVAL": 500, + "API_CONCURRENCY": 2 }, "BANDWIDTH_BATCH_SIZE": [ { From b4ec1877c7c59b0abe573840c9f9278688e4e385 Mon Sep 17 00:00:00 2001 From: Naveen Date: Mon, 29 May 2023 15:15:07 +0530 Subject: [PATCH 04/43] added permission --- data/default/ACCESSCONTROL-ROLEACTIONS/roleactions.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/data/default/ACCESSCONTROL-ROLEACTIONS/roleactions.json b/data/default/ACCESSCONTROL-ROLEACTIONS/roleactions.json index b03ba6169..16b8670de 100644 --- a/data/default/ACCESSCONTROL-ROLEACTIONS/roleactions.json +++ b/data/default/ACCESSCONTROL-ROLEACTIONS/roleactions.json @@ -26,6 +26,12 @@ "actioncode": "", "tenantId": "default" }, + { + "rolecode": "DISTRIBUTOR", + "actionid": 1651, + "actioncode": "", + "tenantId": "default" + }, { "rolecode": "SUPERUSER", "actionid": 629, From e23afa7facff15a77099cfa51c59ec5a79b6a78f Mon Sep 17 00:00:00 2001 From: Ajil Oommen Date: Thu, 1 Jun 2023 11:49:45 +0530 Subject: [PATCH 05/43] Update field-app-configuration.json --- data/default/health/field-app-configuration.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/data/default/health/field-app-configuration.json b/data/default/health/field-app-configuration.json index 616d6799c..022e07420 100644 --- a/data/default/health/field-app-configuration.json +++ b/data/default/health/field-app-configuration.json @@ -419,6 +419,11 @@ } } ] + }, + "FIREBASE_CONFIGURATION": { + "CRASHLYTICS": { + "ENABLED": true + } } } ] From 70864c924ebd168cf6f4173683fbbcd92b920d3a Mon Sep 17 00:00:00 2001 From: guruprasad sreenivasarao Date: Mon, 12 Jun 2023 11:21:12 +0530 Subject: [PATCH 06/43] Changed auto sync service interval to 10 minutes (600 seconds) and added a few values to calculate batch size. --- data/default/health/field-app-configuration.json | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/data/default/health/field-app-configuration.json b/data/default/health/field-app-configuration.json index 616d6799c..b6ab362f6 100644 --- a/data/default/health/field-app-configuration.json +++ b/data/default/health/field-app-configuration.json @@ -10,7 +10,7 @@ "TENANT_ID": "default", "BACKGROUND_SERVICE_CONFIG": { "BATTERY_PERCENT_CUT_OFF": 10, - "SERVICE_INTERVAL": 500, + "SERVICE_INTERVAL": 600, "API_CONCURRENCY": 2 }, "BANDWIDTH_BATCH_SIZE": [ @@ -23,6 +23,16 @@ "MIN_RANGE": 0.20, "MAX_RANGE": 0.50, "BATCH_SIZE": 5 + }, + { + "MIN_RANGE": 0.50, + "MAX_RANGE": 1, + "BATCH_SIZE": 10 + }, + { + "MIN_RANGE": 1, + "MAX_RANGE": 5, + "BATCH_SIZE": 15 } ], "LANGUAGES": [ From b5e687d6ee804776b2c79220c30cd101fd16b0fc Mon Sep 17 00:00:00 2001 From: guruprasad sreenivasarao Date: Mon, 12 Jun 2023 11:54:49 +0530 Subject: [PATCH 07/43] added auto sync settings for time interval and batch size --- data/default/health/field-app-configuration.json | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/data/default/health/field-app-configuration.json b/data/default/health/field-app-configuration.json index 616d6799c..b6ab362f6 100644 --- a/data/default/health/field-app-configuration.json +++ b/data/default/health/field-app-configuration.json @@ -10,7 +10,7 @@ "TENANT_ID": "default", "BACKGROUND_SERVICE_CONFIG": { "BATTERY_PERCENT_CUT_OFF": 10, - "SERVICE_INTERVAL": 500, + "SERVICE_INTERVAL": 600, "API_CONCURRENCY": 2 }, "BANDWIDTH_BATCH_SIZE": [ @@ -23,6 +23,16 @@ "MIN_RANGE": 0.20, "MAX_RANGE": 0.50, "BATCH_SIZE": 5 + }, + { + "MIN_RANGE": 0.50, + "MAX_RANGE": 1, + "BATCH_SIZE": 10 + }, + { + "MIN_RANGE": 1, + "MAX_RANGE": 5, + "BATCH_SIZE": 15 } ], "LANGUAGES": [ From 791ced7d6a6d8f1ce1ca0aa2833515777ef365b3 Mon Sep 17 00:00:00 2001 From: Shiva Burade Date: Wed, 14 Jun 2023 12:12:31 +0530 Subject: [PATCH 08/43] [hlm-2953]: Added workflow service config for default --- data/default/Workflow/AutoEscalation.json | 26 ++ .../AutoEscalationStatesToIgnore.json | 11 + data/default/Workflow/BusinessService.json | 301 ++++++++++++++++++ .../Workflow/BusinessServiceConfig.json | 14 + .../Workflow/BusinessServiceMasterConfig.json | 21 ++ 5 files changed, 373 insertions(+) create mode 100644 data/default/Workflow/AutoEscalation.json create mode 100644 data/default/Workflow/AutoEscalationStatesToIgnore.json create mode 100644 data/default/Workflow/BusinessService.json create mode 100644 data/default/Workflow/BusinessServiceConfig.json create mode 100644 data/default/Workflow/BusinessServiceMasterConfig.json diff --git a/data/default/Workflow/AutoEscalation.json b/data/default/Workflow/AutoEscalation.json new file mode 100644 index 000000000..9b82b47da --- /dev/null +++ b/data/default/Workflow/AutoEscalation.json @@ -0,0 +1,26 @@ +{ + "tenantId": "default", + "moduleName": "Workflow", + "AutoEscalation": [ + { + "businessService": "NewTL", + "module": "tl-services", + "state": "PENDINGAPPROVAL", + "action": "APPROVE", + "active": "true", + "stateSLA": 2.0, + "businessSLA": null, + "topic" : "tl-auto-escalation" + }, + { + "businessService": "PGR", + "module": "pgr-services", + "state": "RESOLVED", + "action": "CLOSERESOLVEDCOMPLAIN", + "active": "true", + "stateSLA": 1.0, + "businessSLA": null, + "topic" : "pgr-auto-escalation" + } + ] +} diff --git a/data/default/Workflow/AutoEscalationStatesToIgnore.json b/data/default/Workflow/AutoEscalationStatesToIgnore.json new file mode 100644 index 000000000..be41306f7 --- /dev/null +++ b/data/default/Workflow/AutoEscalationStatesToIgnore.json @@ -0,0 +1,11 @@ +{ + "tenantId": "default", + "moduleName": "Workflow", + "AutoEscalationStatesToIgnore": [ + { + "businessService": "NewTL", + "module": "TL", + "state": ["INITIATED","PENDINGAPPROVAL"] + } + ] +} diff --git a/data/default/Workflow/BusinessService.json b/data/default/Workflow/BusinessService.json new file mode 100644 index 000000000..a06945b73 --- /dev/null +++ b/data/default/Workflow/BusinessService.json @@ -0,0 +1,301 @@ +{ + "tenantId": "default", + "moduleName": "Workflow", + "BusinessService": [ + { + "tenantId": "default", + "uuid": "2b75575a-f84d-11e8-8eb2-f2801f1b9fd1", + "businessService": "NewTL", + "getUri": "", + "postUri": "", + "states": [ + { + "businessServiceId": "NewTL", + "state": "INITIATED", + "applicableNextStates": "APPLIED", + "applicableActions": "INITIATE", + "docUploadRequired": "false", + "UpdateAllowed": "false", + "isTerminateState": "false", + "isStartState": "true", + "uuid": "bf5fd4f4-f7df-11e8-8eb2-f2801f1b9fd1", + "tenantId": "default", + "actions": [ + { + "stateId": "bf5fd4f4-f7df-11e8-8eb2-f2801f1b9fd1", + "action": "APPLY", + "nextStateId": "bf5fd8c8-f7df-11e8-8eb2-f2801f1b9fd1", + "roles": "CITIZEN,TL_CEMP", + "tenantId": "default", + "uuid": "4bd0f10a-f7d3-11e8-8eb2-f2801f1b9fd1" + } + ] + }, + { + "businessServiceId": "NewTL", + "state": "APPLIED", + "applicableNextStates": "Paid,Cancelled,Rejected", + "applicableActions": "Reject,Pay,Cancel,Mark", + "docUploadRequired": "false", + "UpdateAllowed": "true", + "isTerminateState": "false", + "isStartState": "false", + "uuid": "bf5fd8c8-f7df-11e8-8eb2-f2801f1b9fd1", + "tenantId": "default", + "actions": [ + { + "stateId": "bf5fd8c8-f7df-11e8-8eb2-f2801f1b9fd1", + "action": "PAY", + "nextStateId": "bf5fdaee-f7df-11e8-8eb2-f2801f1b9fd1", + "roles": "SYSTEM_PAYMENT", + "tenantId": "default", + "uuid": "4bd0f2a4-f7d3-11e8-8eb2-f2801f1b9fd1" + }, + { + "stateId": "bf5fd8c8-f7df-11e8-8eb2-f2801f1b9fd1", + "action": "CANCEL", + "nextStateId": "bf5fe0fc-f7df-11e8-8eb2-f2801f1b9fd1", + "roles": "CLERK", + "tenantId": "default", + "uuid": "4bd0f3ee-f7d3-11e8-8eb2-f2801f1b9fd1" + }, + { + "stateId": "bf5fd8c8-f7df-11e8-8eb2-f2801f1b9fd1", + "action": "REJECT", + "nextStateId": "bf5fe318-f7df-11e8-8eb2-f2801f1b9fd1", + "roles": "CLERK", + "tenantId": "default", + "uuid": "4bd0f524-f7d3-11e8-8eb2-f2801f1b9fd1" + }, + { + "stateId": "bf5fe444-f7df-11e8-8eb2-f2801f1b9fd1", + "action": "APPROVE", + "nextStateId": "bf5fdfbc-f7df-11e8-8eb2-f2801f1b9fd1", + "roles": "TL_APPROVER", + "tenantId": "default", + "uuid": "543f802e-f952-11e8-8eb2-f2801f1b9fd1" + } + ] + }, + { + "businessServiceId": "NewTL", + "state": "PAID", + "applicableNextStates": "Intermediate", + "applicableActions": "Approve,Cancel,Reject,Mark", + "docUploadRequired": "false", + "UpdateAllowed": "true", + "isTerminateState": "false", + "isStartState": "false", + "uuid": "bf5fdaee-f7df-11e8-8eb2-f2801f1b9fd1", + "tenantId": "default", + "actions": [ + { + "stateId": "bf5fdaee-f7df-11e8-8eb2-f2801f1b9fd1", + "action": "CANCEL", + "nextStateId": "bf5fe0fc-f7df-11e8-8eb2-f2801f1b9fd1", + "roles": "CLERK", + "tenantId": "default", + "uuid": "4bd0faa6-f7d3-11e8-8eb2-f2801f1b9fd1" + }, + { + "stateId": "bf5fdaee-f7df-11e8-8eb2-f2801f1b9fd1", + "action": "REJECT", + "nextStateId": "bf5fe318-f7df-11e8-8eb2-f2801f1b9fd1", + "roles": "CLERK", + "tenantId": "default", + "uuid": "4bd0fc54-f7d3-11e8-8eb2-f2801f1b9fd1" + }, + { + "stateId": "bf5fdaee-f7df-11e8-8eb2-f2801f1b9fd1", + "action": "MARK", + "nextStateId": "bf5fdaee-f7df-11e8-8eb2-f2801f1b9fd1", + "roles": "CLERK", + "tenantId": "default", + "uuid": "4bd0feac-f7d3-11e8-8eb2-f2801f1b9fd1" + }, + { + "stateId": "bf5fdaee-f7df-11e8-8eb2-f2801f1b9fd1", + "action": "FORWARD", + "nextStateId": "bf5fdd28-f7df-11e8-8eb2-f2801f1b9fd1", + "roles": "CLERK", + "tenantId": "default", + "uuid": "4bd10136-f7d3-11e8-8eb2-f2801f1b9fd1" + } + ] + }, + { + "businessServiceId": "NewTL", + "state": "FIELDINSPECTION", + "applicableNextStates": "Approved,Cancelled,Rejected", + "applicableActions": "", + "docUploadRequired": "", + "UpdateAllowed": "", + "isTerminateState": "false", + "isStartState": "false", + "uuid": "bf5fdd28-f7df-11e8-8eb2-f2801f1b9fd1", + "tenantId": "default", + "actions": [ + { + "stateId": "bf5fdd28-f7df-11e8-8eb2-f2801f1b9fd1", + "action": "CANCEL", + "nextStateId": "bf5fe0fc-f7df-11e8-8eb2-f2801f1b9fd1", + "roles": "TL_FIELD_INSPECTOR", + "tenantId": "default", + "uuid": "4bd1041a-f7d3-11e8-8eb2-f2801f1b9fd1" + }, + { + "stateId": "bf5fdd28-f7df-11e8-8eb2-f2801f1b9fd1", + "action": "REJECT", + "nextStateId": "bf5fe318-f7df-11e8-8eb2-f2801f1b9fd1", + "roles": "TL_FIELD_INSPECTOR", + "tenantId": "default", + "uuid": "4bd1064a-f7d3-11e8-8eb2-f2801f1b9fd1" + }, + { + "stateId": "bf5fdd28-f7df-11e8-8eb2-f2801f1b9fd1", + "action": "MARK", + "nextStateId": "bf5fdd28-f7df-11e8-8eb2-f2801f1b9fd1", + "roles": "TL_FIELD_INSPECTOR", + "tenantId": "default", + "uuid": "4bd108ac-f7d3-11e8-8eb2-f2801f1b9fd1" + }, + { + "stateId": "bf5fdd28-f7df-11e8-8eb2-f2801f1b9fd1", + "action": "FORWARD", + "nextStateId": "bf5fe444-f7df-11e8-8eb2-f2801f1b9fd1", + "roles": "TL_FIELD_INSPECTOR", + "tenantId": "default", + "uuid": "4bd10de8-f7d3-11e8-8eb2-f2801f1b9fd1" + } + ] + }, + { + "businessServiceId": "NewTL", + "state": "APPROVED", + "applicableNextStates": "", + "applicableActions": "CANCEL", + "docUploadRequired": "true", + "UpdateAllowed": "true", + "isTerminateState": "true", + "isStartState": "false", + "uuid": "bf5fdfbc-f7df-11e8-8eb2-f2801f1b9fd1", + "tenantId": "default", + "actions": [ + { + "stateId": "bf5fdfbc-f7df-11e8-8eb2-f2801f1b9fd1", + "action": "CANCEL", + "nextStateId": "bf5fe0fc-f7df-11e8-8eb2-f2801f1b9fd1", + "roles": "TL_APPROVER", + "tenantId": "default", + "uuid": "4bd11770-f7d3-11e8-8eb2-f2801f1b9fd1" + } + ] + }, + { + "businessServiceId": "NewTL", + "state": "CANCELLED", + "applicableNextStates": "", + "applicableActions": "", + "docUploadRequired": "false", + "UpdateAllowed": "true", + "isTerminateState": "true", + "isStartState": "false", + "uuid": "bf5fe0fc-f7df-11e8-8eb2-f2801f1b9fd1", + "tenantId": "default", + "actions": [ + { + "stateId": "bf5fe0fc-f7df-11e8-8eb2-f2801f1b9fd1", + "action": "", + "nextStateId": "", + "roles": "", + "tenantId": "default", + "uuid": "4bd112e8-f7d3-11e8-8eb2-f2801f1b9fd1" + } + ] + }, + { + "businessServiceId": "NewTL", + "state": "REJECTED", + "applicableNextStates": "Initiated", + "applicableActions": "Reapply", + "docUploadRequired": "true", + "UpdateAllowed": "true", + "isTerminateState": "true", + "isStartState": "false", + "uuid": "bf5fe318-f7df-11e8-8eb2-f2801f1b9fd1", + "tenantId": "default", + "actions": [ + { + "stateId": "bf5fe318-f7df-11e8-8eb2-f2801f1b9fd1", + "action": "REINITIATE", + "nextStateId": "bf5fd4f4-f7df-11e8-8eb2-f2801f1b9fd1", + "roles": "CITIZEN,TL_CEMP", + "tenantId": "default", + "uuid": "4bd115fe-f7d3-11e8-8eb2-f2801f1b9fd1" + } + ] + }, + { + "businessServiceId": "NewTL", + "state": "PENDINGAPPROVAL", + "applicableNextStates": "", + "applicableActions": "", + "docUploadRequired": "", + "UpdateAllowed": "", + "isTerminateState": "false", + "isStartState": "false", + "uuid": "bf5fe444-f7df-11e8-8eb2-f2801f1b9fd1", + "tenantId": "default", + "actions": [ + { + "stateId": "bf5fe444-f7df-11e8-8eb2-f2801f1b9fd1", + "action": "APPROVE", + "nextStateId": "bf5fdfbc-f7df-11e8-8eb2-f2801f1b9fd1", + "roles": "TL_APPROVER", + "tenantId": "default", + "uuid": "4bd10f50-f7d3-11e8-8eb2-f2801f1b9fd1" + }, + { + "stateId": "bf5fe444-f7df-11e8-8eb2-f2801f1b9fd1", + "action": "CANCEL", + "nextStateId": "bf5fe0fc-f7df-11e8-8eb2-f2801f1b9fd1", + "roles": "TL_APPROVER", + "tenantId": "default", + "uuid": "4bd11086-f7d3-11e8-8eb2-f2801f1b9fd1" + }, + { + "stateId": "bf5fe444-f7df-11e8-8eb2-f2801f1b9fd1", + "action": "REJECT", + "nextStateId": "bf5fe318-f7df-11e8-8eb2-f2801f1b9fd1", + "roles": "TL_APPROVER", + "tenantId": "default", + "uuid": "4bd111a8-f7d3-11e8-8eb2-f2801f1b9fd1" + } + ] + }, + { + "businessServiceId": "NewTL", + "state": "", + "applicableNextStates": "Initiated", + "applicableActions": "INITIATE", + "docUploadRequired": "false", + "UpdateAllowed": "true", + "isTerminateState": "false", + "isStartState": "true", + "uuid": "9d458700-f894-11e8-8eb2-f2801f1b9fd1", + "tenantId": "default", + "actions": [ + { + "stateId": "9d458700-f894-11e8-8eb2-f2801f1b9fd1", + "action": "INITIATE", + "nextStateId": "bf5fd4f4-f7df-11e8-8eb2-f2801f1b9fd1", + "roles": "CITIZEN,TL_CEMP", + "tenantId": "default", + "uuid": "2efb9036-f895-11e8-8eb2-f2801f1b9fd1" + } + ] + } + ] + } + ] +} diff --git a/data/default/Workflow/BusinessServiceConfig.json b/data/default/Workflow/BusinessServiceConfig.json new file mode 100644 index 000000000..a3b017393 --- /dev/null +++ b/data/default/Workflow/BusinessServiceConfig.json @@ -0,0 +1,14 @@ +{ + "tenantId": "default", + "moduleName": "Workflow", + "BusinessServiceConfig": [ + { + "code": "NEWTL", + "isStateLevel": true + }, + { + "code": "FIRENOC", + "isStateLevel": true + } + ] +} diff --git a/data/default/Workflow/BusinessServiceMasterConfig.json b/data/default/Workflow/BusinessServiceMasterConfig.json new file mode 100644 index 000000000..fde433828 --- /dev/null +++ b/data/default/Workflow/BusinessServiceMasterConfig.json @@ -0,0 +1,21 @@ +{ + "tenantId": "default", + "moduleName": "Workflow", + "BusinessServiceMasterConfig": [ + { + "businessService": "NewTL", + "active": "true", + "isStatelevel": "true" + }, + { + "businessService": "PGR", + "active": "true", + "isStatelevel": "true" + }, + { + "businessService": "DisconnectSWConnection1", + "active": "true", + "isStatelevel": "false" + } + ] +} From 8a1f55d0305df737c5d409c49e9878efd1eb3c54 Mon Sep 17 00:00:00 2001 From: Shiva Burade Date: Wed, 14 Jun 2023 12:49:49 +0530 Subject: [PATCH 09/43] [hlm-2953]: Added workflow service config for default --- data/default/Workflow/BusinessService.json | 397 ++++++------------ .../Workflow/BusinessServiceConfig.json | 4 + 2 files changed, 138 insertions(+), 263 deletions(-) diff --git a/data/default/Workflow/BusinessService.json b/data/default/Workflow/BusinessService.json index a06945b73..65fb3066d 100644 --- a/data/default/Workflow/BusinessService.json +++ b/data/default/Workflow/BusinessService.json @@ -4,296 +4,167 @@ "BusinessService": [ { "tenantId": "default", - "uuid": "2b75575a-f84d-11e8-8eb2-f2801f1b9fd1", - "businessService": "NewTL", - "getUri": "", - "postUri": "", + "uuid": "d6536787-f590-4e00-85b2-434198902252", + "businessService": "PGR", + "business": "pgr-services", + "businessServiceSla": 432000000, "states": [ { - "businessServiceId": "NewTL", - "state": "INITIATED", - "applicableNextStates": "APPLIED", - "applicableActions": "INITIATE", - "docUploadRequired": "false", - "UpdateAllowed": "false", - "isTerminateState": "false", - "isStartState": "true", - "uuid": "bf5fd4f4-f7df-11e8-8eb2-f2801f1b9fd1", + "auditDetails": { + "createdBy": "adf829ff-7a65-4e8b-b1a7-191ec298e79e", + "lastModifiedBy": "adf829ff-7a65-4e8b-b1a7-191ec298e79e", + "createdTime": 1680526024538, + "lastModifiedTime": 1680526024538 + }, + "uuid": "11beb7b7-9a13-47ec-afd2-bea9bd380b16", "tenantId": "default", + "businessServiceId": "PGR", + "sla": null, + "state": null, + "applicationStatus": null, + "docUploadRequired": false, + "isStartState": true, + "isTerminateState": false, + "isStateUpdatable": true, "actions": [ { - "stateId": "bf5fd4f4-f7df-11e8-8eb2-f2801f1b9fd1", - "action": "APPLY", - "nextStateId": "bf5fd8c8-f7df-11e8-8eb2-f2801f1b9fd1", - "roles": "CITIZEN,TL_CEMP", - "tenantId": "default", - "uuid": "4bd0f10a-f7d3-11e8-8eb2-f2801f1b9fd1" + "auditDetails": { + "createdBy": "adf829ff-7a65-4e8b-b1a7-191ec298e79e", + "lastModifiedBy": "adf829ff-7a65-4e8b-b1a7-191ec298e79e", + "createdTime": 1680526024538, + "lastModifiedTime": 1680526024538 + }, + "uuid": "b2e3e65c-d191-44d1-bfd4-73e9c7bfbe51", + "tenantId": "default", + "currentState": "11beb7b7-9a13-47ec-afd2-bea9bd380b16", + "action": "CREATE", + "nextState": "8db017dd-0acd-4544-a48d-d8bf33a2ebb9", + "roles": [ + "REGISTRAR", + "DISTRIBUTOR", + "WAREHOUSE_MANAGER", + "HELPDESK_USER", + "SYSTEM_ADMINISTRATOR" + ], + "active": true } ] }, { - "businessServiceId": "NewTL", - "state": "APPLIED", - "applicableNextStates": "Paid,Cancelled,Rejected", - "applicableActions": "Reject,Pay,Cancel,Mark", - "docUploadRequired": "false", - "UpdateAllowed": "true", - "isTerminateState": "false", - "isStartState": "false", - "uuid": "bf5fd8c8-f7df-11e8-8eb2-f2801f1b9fd1", + "auditDetails": { + "createdBy": "adf829ff-7a65-4e8b-b1a7-191ec298e79e", + "lastModifiedBy": "adf829ff-7a65-4e8b-b1a7-191ec298e79e", + "createdTime": 1680526024538, + "lastModifiedTime": 1680526024538 + }, + "uuid": "8db017dd-0acd-4544-a48d-d8bf33a2ebb9", "tenantId": "default", + "businessServiceId": "PGR", + "sla": null, + "state": "PENDING_ASSIGNMENT", + "applicationStatus": "PENDING_ASSIGNMENT", + "docUploadRequired": false, + "isStartState": false, + "isTerminateState": false, + "isStateUpdatable": false, "actions": [ { - "stateId": "bf5fd8c8-f7df-11e8-8eb2-f2801f1b9fd1", - "action": "PAY", - "nextStateId": "bf5fdaee-f7df-11e8-8eb2-f2801f1b9fd1", - "roles": "SYSTEM_PAYMENT", - "tenantId": "default", - "uuid": "4bd0f2a4-f7d3-11e8-8eb2-f2801f1b9fd1" + "auditDetails": { + "createdBy": "adf829ff-7a65-4e8b-b1a7-191ec298e79e", + "lastModifiedBy": "adf829ff-7a65-4e8b-b1a7-191ec298e79e", + "createdTime": 1680526024538, + "lastModifiedTime": 1680526024538 + }, + "uuid": "ae1ab712-a663-485e-963b-e70b1576594a", + "tenantId": "default", + "currentState": "8db017dd-0acd-4544-a48d-d8bf33a2ebb9", + "action": "RESOLVE", + "nextState": "6f58ceed-a0de-46ec-af25-3616cbdb994f", + "roles": [ + "HELPDESK_USER", + "L2_SUPPORT", + "PROGRAMMATIC_SUPPORT", + "SYSTEM_ADMINISTRATOR" + ], + "active": true }, { - "stateId": "bf5fd8c8-f7df-11e8-8eb2-f2801f1b9fd1", - "action": "CANCEL", - "nextStateId": "bf5fe0fc-f7df-11e8-8eb2-f2801f1b9fd1", - "roles": "CLERK", - "tenantId": "default", - "uuid": "4bd0f3ee-f7d3-11e8-8eb2-f2801f1b9fd1" + "auditDetails": { + "createdBy": "adf829ff-7a65-4e8b-b1a7-191ec298e79e", + "lastModifiedBy": "adf829ff-7a65-4e8b-b1a7-191ec298e79e", + "createdTime": 1680526024538, + "lastModifiedTime": 1680526024538 + }, + "uuid": "f3fabaed-f89f-4cd1-a949-a3a2dacff415", + "tenantId": "default", + "currentState": "8db017dd-0acd-4544-a48d-d8bf33a2ebb9", + "action": "PENDING_ASSIGNMENT", + "nextState": "8db017dd-0acd-4544-a48d-d8bf33a2ebb9", + "roles": [ + "HELPDESK_USER", + "L2_SUPPORT", + "PROGRAMMATIC_SUPPORT", + "SYSTEM_ADMINISTRATOR" + ], + "active": true }, { - "stateId": "bf5fd8c8-f7df-11e8-8eb2-f2801f1b9fd1", - "action": "REJECT", - "nextStateId": "bf5fe318-f7df-11e8-8eb2-f2801f1b9fd1", - "roles": "CLERK", + "auditDetails": { + "createdBy": "adf829ff-7a65-4e8b-b1a7-191ec298e79e", + "lastModifiedBy": "adf829ff-7a65-4e8b-b1a7-191ec298e79e", + "createdTime": 1680526024538, + "lastModifiedTime": 1680526024538 + }, + "uuid": "a5ef9717-e3b0-4143-b6b9-aafbc904d610", "tenantId": "default", - "uuid": "4bd0f524-f7d3-11e8-8eb2-f2801f1b9fd1" - }, - { - "stateId": "bf5fe444-f7df-11e8-8eb2-f2801f1b9fd1", - "action": "APPROVE", - "nextStateId": "bf5fdfbc-f7df-11e8-8eb2-f2801f1b9fd1", - "roles": "TL_APPROVER", - "tenantId": "default", - "uuid": "543f802e-f952-11e8-8eb2-f2801f1b9fd1" - } - ] - }, - { - "businessServiceId": "NewTL", - "state": "PAID", - "applicableNextStates": "Intermediate", - "applicableActions": "Approve,Cancel,Reject,Mark", - "docUploadRequired": "false", - "UpdateAllowed": "true", - "isTerminateState": "false", - "isStartState": "false", - "uuid": "bf5fdaee-f7df-11e8-8eb2-f2801f1b9fd1", - "tenantId": "default", - "actions": [ - { - "stateId": "bf5fdaee-f7df-11e8-8eb2-f2801f1b9fd1", - "action": "CANCEL", - "nextStateId": "bf5fe0fc-f7df-11e8-8eb2-f2801f1b9fd1", - "roles": "CLERK", - "tenantId": "default", - "uuid": "4bd0faa6-f7d3-11e8-8eb2-f2801f1b9fd1" - }, - { - "stateId": "bf5fdaee-f7df-11e8-8eb2-f2801f1b9fd1", + "currentState": "8db017dd-0acd-4544-a48d-d8bf33a2ebb9", "action": "REJECT", - "nextStateId": "bf5fe318-f7df-11e8-8eb2-f2801f1b9fd1", - "roles": "CLERK", - "tenantId": "default", - "uuid": "4bd0fc54-f7d3-11e8-8eb2-f2801f1b9fd1" - }, - { - "stateId": "bf5fdaee-f7df-11e8-8eb2-f2801f1b9fd1", - "action": "MARK", - "nextStateId": "bf5fdaee-f7df-11e8-8eb2-f2801f1b9fd1", - "roles": "CLERK", - "tenantId": "default", - "uuid": "4bd0feac-f7d3-11e8-8eb2-f2801f1b9fd1" - }, - { - "stateId": "bf5fdaee-f7df-11e8-8eb2-f2801f1b9fd1", - "action": "FORWARD", - "nextStateId": "bf5fdd28-f7df-11e8-8eb2-f2801f1b9fd1", - "roles": "CLERK", - "tenantId": "default", - "uuid": "4bd10136-f7d3-11e8-8eb2-f2801f1b9fd1" + "nextState": "38e9938f-5990-4189-8c4a-acf9fa3f061b", + "roles": [ + "HELPDESK_USER", + "SYSTEM_ADMINISTRATOR" + ], + "active": true } ] }, { - "businessServiceId": "NewTL", - "state": "FIELDINSPECTION", - "applicableNextStates": "Approved,Cancelled,Rejected", - "applicableActions": "", - "docUploadRequired": "", - "UpdateAllowed": "", - "isTerminateState": "false", - "isStartState": "false", - "uuid": "bf5fdd28-f7df-11e8-8eb2-f2801f1b9fd1", + "auditDetails": { + "createdBy": "adf829ff-7a65-4e8b-b1a7-191ec298e79e", + "lastModifiedBy": "adf829ff-7a65-4e8b-b1a7-191ec298e79e", + "createdTime": 1680526024538, + "lastModifiedTime": 1680526024538 + }, + "uuid": "6f58ceed-a0de-46ec-af25-3616cbdb994f", "tenantId": "default", - "actions": [ - { - "stateId": "bf5fdd28-f7df-11e8-8eb2-f2801f1b9fd1", - "action": "CANCEL", - "nextStateId": "bf5fe0fc-f7df-11e8-8eb2-f2801f1b9fd1", - "roles": "TL_FIELD_INSPECTOR", - "tenantId": "default", - "uuid": "4bd1041a-f7d3-11e8-8eb2-f2801f1b9fd1" - }, - { - "stateId": "bf5fdd28-f7df-11e8-8eb2-f2801f1b9fd1", - "action": "REJECT", - "nextStateId": "bf5fe318-f7df-11e8-8eb2-f2801f1b9fd1", - "roles": "TL_FIELD_INSPECTOR", - "tenantId": "default", - "uuid": "4bd1064a-f7d3-11e8-8eb2-f2801f1b9fd1" - }, - { - "stateId": "bf5fdd28-f7df-11e8-8eb2-f2801f1b9fd1", - "action": "MARK", - "nextStateId": "bf5fdd28-f7df-11e8-8eb2-f2801f1b9fd1", - "roles": "TL_FIELD_INSPECTOR", - "tenantId": "default", - "uuid": "4bd108ac-f7d3-11e8-8eb2-f2801f1b9fd1" - }, - { - "stateId": "bf5fdd28-f7df-11e8-8eb2-f2801f1b9fd1", - "action": "FORWARD", - "nextStateId": "bf5fe444-f7df-11e8-8eb2-f2801f1b9fd1", - "roles": "TL_FIELD_INSPECTOR", - "tenantId": "default", - "uuid": "4bd10de8-f7d3-11e8-8eb2-f2801f1b9fd1" - } - ] + "businessServiceId": "PGR", + "sla": null, + "state": "RESOLVED", + "applicationStatus": "RESOLVED", + "docUploadRequired": false, + "isStartState": false, + "isTerminateState": true, + "isStateUpdatable": false, + "actions": null }, { - "businessServiceId": "NewTL", - "state": "APPROVED", - "applicableNextStates": "", - "applicableActions": "CANCEL", - "docUploadRequired": "true", - "UpdateAllowed": "true", - "isTerminateState": "true", - "isStartState": "false", - "uuid": "bf5fdfbc-f7df-11e8-8eb2-f2801f1b9fd1", + "auditDetails": { + "createdBy": "adf829ff-7a65-4e8b-b1a7-191ec298e79e", + "lastModifiedBy": "adf829ff-7a65-4e8b-b1a7-191ec298e79e", + "createdTime": 1680526024538, + "lastModifiedTime": 1680526024538 + }, + "uuid": "38e9938f-5990-4189-8c4a-acf9fa3f061b", "tenantId": "default", - "actions": [ - { - "stateId": "bf5fdfbc-f7df-11e8-8eb2-f2801f1b9fd1", - "action": "CANCEL", - "nextStateId": "bf5fe0fc-f7df-11e8-8eb2-f2801f1b9fd1", - "roles": "TL_APPROVER", - "tenantId": "default", - "uuid": "4bd11770-f7d3-11e8-8eb2-f2801f1b9fd1" - } - ] - }, - { - "businessServiceId": "NewTL", - "state": "CANCELLED", - "applicableNextStates": "", - "applicableActions": "", - "docUploadRequired": "false", - "UpdateAllowed": "true", - "isTerminateState": "true", - "isStartState": "false", - "uuid": "bf5fe0fc-f7df-11e8-8eb2-f2801f1b9fd1", - "tenantId": "default", - "actions": [ - { - "stateId": "bf5fe0fc-f7df-11e8-8eb2-f2801f1b9fd1", - "action": "", - "nextStateId": "", - "roles": "", - "tenantId": "default", - "uuid": "4bd112e8-f7d3-11e8-8eb2-f2801f1b9fd1" - } - ] - }, - { - "businessServiceId": "NewTL", + "businessServiceId": "PGR", + "sla": null, "state": "REJECTED", - "applicableNextStates": "Initiated", - "applicableActions": "Reapply", - "docUploadRequired": "true", - "UpdateAllowed": "true", - "isTerminateState": "true", - "isStartState": "false", - "uuid": "bf5fe318-f7df-11e8-8eb2-f2801f1b9fd1", - "tenantId": "default", - "actions": [ - { - "stateId": "bf5fe318-f7df-11e8-8eb2-f2801f1b9fd1", - "action": "REINITIATE", - "nextStateId": "bf5fd4f4-f7df-11e8-8eb2-f2801f1b9fd1", - "roles": "CITIZEN,TL_CEMP", - "tenantId": "default", - "uuid": "4bd115fe-f7d3-11e8-8eb2-f2801f1b9fd1" - } - ] - }, - { - "businessServiceId": "NewTL", - "state": "PENDINGAPPROVAL", - "applicableNextStates": "", - "applicableActions": "", - "docUploadRequired": "", - "UpdateAllowed": "", - "isTerminateState": "false", - "isStartState": "false", - "uuid": "bf5fe444-f7df-11e8-8eb2-f2801f1b9fd1", - "tenantId": "default", - "actions": [ - { - "stateId": "bf5fe444-f7df-11e8-8eb2-f2801f1b9fd1", - "action": "APPROVE", - "nextStateId": "bf5fdfbc-f7df-11e8-8eb2-f2801f1b9fd1", - "roles": "TL_APPROVER", - "tenantId": "default", - "uuid": "4bd10f50-f7d3-11e8-8eb2-f2801f1b9fd1" - }, - { - "stateId": "bf5fe444-f7df-11e8-8eb2-f2801f1b9fd1", - "action": "CANCEL", - "nextStateId": "bf5fe0fc-f7df-11e8-8eb2-f2801f1b9fd1", - "roles": "TL_APPROVER", - "tenantId": "default", - "uuid": "4bd11086-f7d3-11e8-8eb2-f2801f1b9fd1" - }, - { - "stateId": "bf5fe444-f7df-11e8-8eb2-f2801f1b9fd1", - "action": "REJECT", - "nextStateId": "bf5fe318-f7df-11e8-8eb2-f2801f1b9fd1", - "roles": "TL_APPROVER", - "tenantId": "default", - "uuid": "4bd111a8-f7d3-11e8-8eb2-f2801f1b9fd1" - } - ] - }, - { - "businessServiceId": "NewTL", - "state": "", - "applicableNextStates": "Initiated", - "applicableActions": "INITIATE", - "docUploadRequired": "false", - "UpdateAllowed": "true", - "isTerminateState": "false", - "isStartState": "true", - "uuid": "9d458700-f894-11e8-8eb2-f2801f1b9fd1", - "tenantId": "default", - "actions": [ - { - "stateId": "9d458700-f894-11e8-8eb2-f2801f1b9fd1", - "action": "INITIATE", - "nextStateId": "bf5fd4f4-f7df-11e8-8eb2-f2801f1b9fd1", - "roles": "CITIZEN,TL_CEMP", - "tenantId": "default", - "uuid": "2efb9036-f895-11e8-8eb2-f2801f1b9fd1" - } - ] + "applicationStatus": "REJECTED", + "docUploadRequired": false, + "isStartState": false, + "isTerminateState": true, + "isStateUpdatable": false, + "actions": null } ] } diff --git a/data/default/Workflow/BusinessServiceConfig.json b/data/default/Workflow/BusinessServiceConfig.json index a3b017393..eb7138648 100644 --- a/data/default/Workflow/BusinessServiceConfig.json +++ b/data/default/Workflow/BusinessServiceConfig.json @@ -9,6 +9,10 @@ { "code": "FIRENOC", "isStateLevel": true + }, + { + "code": "PGR", + "isStateLevel": true } ] } From 4984a62d88f7333b7e447fbe8c75df463291726d Mon Sep 17 00:00:00 2001 From: Shiva Burade Date: Wed, 14 Jun 2023 12:53:23 +0530 Subject: [PATCH 10/43] [hlm-2953]: Updated BusinessServiceConfig.json --- data/default/Workflow/BusinessServiceConfig.json | 8 -------- 1 file changed, 8 deletions(-) diff --git a/data/default/Workflow/BusinessServiceConfig.json b/data/default/Workflow/BusinessServiceConfig.json index eb7138648..b14d2be96 100644 --- a/data/default/Workflow/BusinessServiceConfig.json +++ b/data/default/Workflow/BusinessServiceConfig.json @@ -2,14 +2,6 @@ "tenantId": "default", "moduleName": "Workflow", "BusinessServiceConfig": [ - { - "code": "NEWTL", - "isStateLevel": true - }, - { - "code": "FIRENOC", - "isStateLevel": true - }, { "code": "PGR", "isStateLevel": true From 4746ba65d7887e1b85981d8c40a2177b7b1f8431 Mon Sep 17 00:00:00 2001 From: Shiva Burade Date: Thu, 15 Jun 2023 12:24:18 +0530 Subject: [PATCH 11/43] [hlm-2953]: Updated status path in inboxV2 --- data/default/inbox-v2/InboxConfiguration.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/default/inbox-v2/InboxConfiguration.json b/data/default/inbox-v2/InboxConfiguration.json index 85ee4fe52..2ae9a528f 100644 --- a/data/default/inbox-v2/InboxConfiguration.json +++ b/data/default/inbox-v2/InboxConfiguration.json @@ -14,7 +14,7 @@ }, { "name": "status", - "path": "Data.service.applicationStatus.keyword", + "path": "Data.currentProcessInstance.state.uuid.keyword", "isMandatory": false, "operator": "EQUAL" }, From 0abfdca0c91376babda3c3d7f763572dd2c11181 Mon Sep 17 00:00:00 2001 From: Naveen J <83631045+naveen-egov@users.noreply.github.com> Date: Fri, 16 Jun 2023 12:15:50 +0530 Subject: [PATCH 12/43] Update roleactions.json --- .../roleactions.json | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/data/default/ACCESSCONTROL-ROLEACTIONS/roleactions.json b/data/default/ACCESSCONTROL-ROLEACTIONS/roleactions.json index 16b8670de..24e79649f 100644 --- a/data/default/ACCESSCONTROL-ROLEACTIONS/roleactions.json +++ b/data/default/ACCESSCONTROL-ROLEACTIONS/roleactions.json @@ -8,13 +8,19 @@ "actioncode": "", "tenantid": "default" }, - { + { "rolecode": "REGISTRAR", "actionid": 1629, "actioncode": "", "tenantId": "default" }, - { + { + "rolecode": "REGISTRAR", + "actionid": 1651, + "actioncode": "", + "tenantId": "default" + }, + { "rolecode": "DISTRIBUTOR", "actionid": 1633, "actioncode": "", @@ -14924,6 +14930,12 @@ "actioncode": "", "tenantId": "default" }, + { + "rolecode": "WAREHOUSE_MANAGER", + "actionid": 1651, + "actioncode": "", + "tenantId": "default" + }, { "rolecode": "WAREHOUSE_MANAGER", "actionid": 1594, @@ -15050,6 +15062,12 @@ "actioncode": "", "tenantId": "default" }, + { + "rolecode": "FIELD_SUPERVISOR", + "actionid": 1651, + "actioncode": "", + "tenantId": "default" + }, { "rolecode": "SYSTEM_ADMINISTRATOR", "actionid": 1601, From a7664938aaeefe0895e0db8cc540b20b1375fcff Mon Sep 17 00:00:00 2001 From: Ajil Oommen Date: Wed, 21 Jun 2023 10:35:02 +0530 Subject: [PATCH 13/43] Add firebase config --- data/default/health/field-app-configuration.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/data/default/health/field-app-configuration.json b/data/default/health/field-app-configuration.json index 022e07420..7c9187f0e 100644 --- a/data/default/health/field-app-configuration.json +++ b/data/default/health/field-app-configuration.json @@ -420,10 +420,9 @@ } ] }, - "FIREBASE_CONFIGURATION": { - "CRASHLYTICS": { - "ENABLED": true - } + "FIREBASE_CONFIG": { + "enableCrashlytics": true, + "enableAnalytics": false } } ] From 749f32ed637ea5b0dc9a11aff360ef1cc2c21fed Mon Sep 17 00:00:00 2001 From: Naveen J <83631045+naveen-egov@users.noreply.github.com> Date: Wed, 28 Jun 2023 12:13:37 +0530 Subject: [PATCH 14/43] Update field-app-configuration.json --- data/default/health/field-app-configuration.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/data/default/health/field-app-configuration.json b/data/default/health/field-app-configuration.json index 5cd20617a..175e776a5 100644 --- a/data/default/health/field-app-configuration.json +++ b/data/default/health/field-app-configuration.json @@ -168,6 +168,13 @@ "config": { "localStoreTTL": 172800 } + }, + { + "type": "LOCALIZATION_MODULE", + "name": "hcm-reports", + "config": { + "localStoreTTL": 172800 + } }, { "type": "LOCALIZATION_MODULE", @@ -436,4 +443,4 @@ } } ] -} \ No newline at end of file +} From 282a21e333a9365752d544beb43533e05de19b23 Mon Sep 17 00:00:00 2001 From: Naveen Date: Tue, 11 Jul 2023 12:37:54 +0530 Subject: [PATCH 15/43] added version --- data/default/egov-location/boundary-data.json | 1 + data/default/health/additional-field-schemas.json | 1 + data/default/health/field-app-configuration.json | 11 +++++++++-- data/default/health/project-task-configuration.json | 1 + data/default/health/project-types.json | 1 + data/default/health/service-registry.json | 1 + 6 files changed, 14 insertions(+), 2 deletions(-) diff --git a/data/default/egov-location/boundary-data.json b/data/default/egov-location/boundary-data.json index b9f501691..f40dc8f7a 100644 --- a/data/default/egov-location/boundary-data.json +++ b/data/default/egov-location/boundary-data.json @@ -1,6 +1,7 @@ { "tenantId": "default", "moduleName": "egov-location", + "version":"0.1", "TenantBoundary": [ { "hierarchyType": { diff --git a/data/default/health/additional-field-schemas.json b/data/default/health/additional-field-schemas.json index e09c677ff..786703866 100644 --- a/data/default/health/additional-field-schemas.json +++ b/data/default/health/additional-field-schemas.json @@ -1,6 +1,7 @@ { "tenantId": "default", "moduleName": "HCM-ADDITIONAL-FIELD-SCHEMAS", + "version":"0.1", "additionalFieldSchemas": [ { "schema": "INDIVIDUAL", diff --git a/data/default/health/field-app-configuration.json b/data/default/health/field-app-configuration.json index 175e776a5..ee5896f32 100644 --- a/data/default/health/field-app-configuration.json +++ b/data/default/health/field-app-configuration.json @@ -1,6 +1,7 @@ { "tenantId": "default", "moduleName": "HCM-FIELD-APP-CONFIG", + "version":"0.1", "appConfig": [ { "NETWORK_DETECTION": "OFF | ON", @@ -13,6 +14,12 @@ "SERVICE_INTERVAL": 600, "API_CONCURRENCY": 2 }, + "ROW_VERSIONS": [ + { + "module": "", + "version": "" + } + ], "BANDWIDTH_BATCH_SIZE": [ { "MIN_RANGE": 0.02, @@ -169,7 +176,7 @@ "localStoreTTL": 172800 } }, - { + { "type": "LOCALIZATION_MODULE", "name": "hcm-reports", "config": { @@ -443,4 +450,4 @@ } } ] -} +} \ No newline at end of file diff --git a/data/default/health/project-task-configuration.json b/data/default/health/project-task-configuration.json index aa1db34c2..77d6a41cf 100644 --- a/data/default/health/project-task-configuration.json +++ b/data/default/health/project-task-configuration.json @@ -1,6 +1,7 @@ { "tenantId": "default", "moduleName": "HCM-PROJECT", + "version":"0.1", "projectConfiguration": [{ "beneficiaryTypes": [ "INDIVIDUAL", diff --git a/data/default/health/project-types.json b/data/default/health/project-types.json index fabfa9544..8482e8c43 100644 --- a/data/default/health/project-types.json +++ b/data/default/health/project-types.json @@ -1,6 +1,7 @@ { "tenantId": "default", "moduleName": "HCM-PROJECT-TYPES", + "version":"0.1", "projectTypes": [ { "id": "dbd45c31-de9e-4e62-a9b6-abb818928fd1", diff --git a/data/default/health/service-registry.json b/data/default/health/service-registry.json index 85ec2ff61..6269f8642 100644 --- a/data/default/health/service-registry.json +++ b/data/default/health/service-registry.json @@ -1,6 +1,7 @@ { "tenantId": "default", "moduleName": "HCM-SERVICE-REGISTRY", + "version":"0.1", "serviceRegistry": [ { "service": "USER", From 726ea1f9bcaaaaf00dd50d5ff23068505ab7addd Mon Sep 17 00:00:00 2001 From: Shiva Burade <114394169+shivab-egov@users.noreply.github.com> Date: Tue, 27 Jun 2023 16:46:47 +0530 Subject: [PATCH 16/43] Update InboxConfiguration.json --- data/default/inbox-v2/InboxConfiguration.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/default/inbox-v2/InboxConfiguration.json b/data/default/inbox-v2/InboxConfiguration.json index 2ae9a528f..f2eca83d2 100644 --- a/data/default/inbox-v2/InboxConfiguration.json +++ b/data/default/inbox-v2/InboxConfiguration.json @@ -64,4 +64,4 @@ "Data.service.applicationStatus"] } ] -} \ No newline at end of file +} From dca32f6018d7dd8c49ccebc829603b02d1e6ed3a Mon Sep 17 00:00:00 2001 From: Naveen J <83631045+naveen-egov@users.noreply.github.com> Date: Mon, 3 Jul 2023 16:12:24 +0530 Subject: [PATCH 17/43] Update roleactions.json --- data/default/ACCESSCONTROL-ROLEACTIONS/roleactions.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/data/default/ACCESSCONTROL-ROLEACTIONS/roleactions.json b/data/default/ACCESSCONTROL-ROLEACTIONS/roleactions.json index 24e79649f..62a812d04 100644 --- a/data/default/ACCESSCONTROL-ROLEACTIONS/roleactions.json +++ b/data/default/ACCESSCONTROL-ROLEACTIONS/roleactions.json @@ -20,6 +20,12 @@ "actioncode": "", "tenantId": "default" }, + { + "rolecode": "DISTRIBUTOR", + "actionid": 695, + "actioncode": "", + "tenantId": "default" + }, { "rolecode": "DISTRIBUTOR", "actionid": 1633, From 3b50a85d375f9653f5163cc5b6311ed5dcf660ef Mon Sep 17 00:00:00 2001 From: guruprasad sreenivasarao Date: Mon, 3 Jul 2023 17:47:04 +0530 Subject: [PATCH 18/43] Added user profile update API to distributor --- data/default/ACCESSCONTROL-ROLEACTIONS/roleactions.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/data/default/ACCESSCONTROL-ROLEACTIONS/roleactions.json b/data/default/ACCESSCONTROL-ROLEACTIONS/roleactions.json index 62a812d04..df4af128a 100644 --- a/data/default/ACCESSCONTROL-ROLEACTIONS/roleactions.json +++ b/data/default/ACCESSCONTROL-ROLEACTIONS/roleactions.json @@ -15965,6 +15965,12 @@ "actionid": 1651, "actioncode": "", "tenantId": "default" + }, + { + "rolecode": "DISTRIBUTOR", + "actionid": 698, + "actioncode": "", + "tenantId": "default" } ] } From 36a8a64b03d8b76b2faaa657e8b8b2e5eac262ed Mon Sep 17 00:00:00 2001 From: guruprasad sreenivasarao Date: Tue, 4 Jul 2023 10:17:49 +0530 Subject: [PATCH 19/43] added "/user/profile/_update" end point to service-registry.json --- data/default/health/service-registry.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/data/default/health/service-registry.json b/data/default/health/service-registry.json index dd2e6e8a5..85ec2ff61 100644 --- a/data/default/health/service-registry.json +++ b/data/default/health/service-registry.json @@ -14,6 +14,11 @@ "action": "search", "entityName": "User", "path": "/user/v1/_search" + }, + { + "action": "update", + "entityName": "User", + "path": "/user/profile/_update" } ] }, From b19226a1405b4bddfc0deefb315fe3d9941b9ed0 Mon Sep 17 00:00:00 2001 From: guruprasad sreenivasarao Date: Wed, 5 Jul 2023 14:53:04 +0530 Subject: [PATCH 20/43] Added user profile update API access to warehouse manager and field supervisor --- .../ACCESSCONTROL-ROLEACTIONS/roleactions.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/data/default/ACCESSCONTROL-ROLEACTIONS/roleactions.json b/data/default/ACCESSCONTROL-ROLEACTIONS/roleactions.json index df4af128a..8782a88c1 100644 --- a/data/default/ACCESSCONTROL-ROLEACTIONS/roleactions.json +++ b/data/default/ACCESSCONTROL-ROLEACTIONS/roleactions.json @@ -15971,6 +15971,18 @@ "actionid": 698, "actioncode": "", "tenantId": "default" + }, + { + "rolecode": "WAREHOUSE_MANAGER", + "actionid": 698, + "actioncode": "", + "tenantId": "default" + }, + { + "rolecode": "FIELD_SUPERVISOR", + "actionid": 698, + "actioncode": "", + "tenantId": "default" } ] } From bb614876980e12daef3d0a68cbec74026faad5bc Mon Sep 17 00:00:00 2001 From: guruprasad sreenivasarao Date: Mon, 10 Jul 2023 16:56:40 +0530 Subject: [PATCH 21/43] added bandwidth API access to district supervisor --- .../ACCESSCONTROL-ROLEACTIONS/roleactions.json | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/data/default/ACCESSCONTROL-ROLEACTIONS/roleactions.json b/data/default/ACCESSCONTROL-ROLEACTIONS/roleactions.json index 8782a88c1..6556e1c1d 100644 --- a/data/default/ACCESSCONTROL-ROLEACTIONS/roleactions.json +++ b/data/default/ACCESSCONTROL-ROLEACTIONS/roleactions.json @@ -15655,7 +15655,8 @@ "actionid": 1642, "actioncode": "", "tenantId": "default" - },{ + }, + { "rolecode": "REGISTRAR", "actionid": 1642, "actioncode": "", @@ -15750,7 +15751,8 @@ "actionid": 1643, "actioncode": "", "tenantId": "default" - },{ + }, + { "rolecode": "REGISTRAR", "actionid": 1643, "actioncode": "", @@ -15983,6 +15985,12 @@ "actionid": 698, "actioncode": "", "tenantId": "default" + }, + { + "rolecode": "DISTRICT_SUPERVISOR", + "actionid": 1651, + "actioncode": "", + "tenantId": "default" } ] -} +} \ No newline at end of file From 0da7affdf383c22be18f827362aaf8462ea077e4 Mon Sep 17 00:00:00 2001 From: Naveen Date: Tue, 11 Jul 2023 12:37:54 +0530 Subject: [PATCH 22/43] added version --- data/default/egov-location/boundary-data.json | 1 + data/default/health/additional-field-schemas.json | 1 + data/default/health/field-app-configuration.json | 11 +++++++++-- data/default/health/project-task-configuration.json | 1 + data/default/health/project-types.json | 1 + data/default/health/service-registry.json | 1 + 6 files changed, 14 insertions(+), 2 deletions(-) diff --git a/data/default/egov-location/boundary-data.json b/data/default/egov-location/boundary-data.json index b9f501691..f40dc8f7a 100644 --- a/data/default/egov-location/boundary-data.json +++ b/data/default/egov-location/boundary-data.json @@ -1,6 +1,7 @@ { "tenantId": "default", "moduleName": "egov-location", + "version":"0.1", "TenantBoundary": [ { "hierarchyType": { diff --git a/data/default/health/additional-field-schemas.json b/data/default/health/additional-field-schemas.json index e09c677ff..786703866 100644 --- a/data/default/health/additional-field-schemas.json +++ b/data/default/health/additional-field-schemas.json @@ -1,6 +1,7 @@ { "tenantId": "default", "moduleName": "HCM-ADDITIONAL-FIELD-SCHEMAS", + "version":"0.1", "additionalFieldSchemas": [ { "schema": "INDIVIDUAL", diff --git a/data/default/health/field-app-configuration.json b/data/default/health/field-app-configuration.json index 175e776a5..ee5896f32 100644 --- a/data/default/health/field-app-configuration.json +++ b/data/default/health/field-app-configuration.json @@ -1,6 +1,7 @@ { "tenantId": "default", "moduleName": "HCM-FIELD-APP-CONFIG", + "version":"0.1", "appConfig": [ { "NETWORK_DETECTION": "OFF | ON", @@ -13,6 +14,12 @@ "SERVICE_INTERVAL": 600, "API_CONCURRENCY": 2 }, + "ROW_VERSIONS": [ + { + "module": "", + "version": "" + } + ], "BANDWIDTH_BATCH_SIZE": [ { "MIN_RANGE": 0.02, @@ -169,7 +176,7 @@ "localStoreTTL": 172800 } }, - { + { "type": "LOCALIZATION_MODULE", "name": "hcm-reports", "config": { @@ -443,4 +450,4 @@ } } ] -} +} \ No newline at end of file diff --git a/data/default/health/project-task-configuration.json b/data/default/health/project-task-configuration.json index aa1db34c2..77d6a41cf 100644 --- a/data/default/health/project-task-configuration.json +++ b/data/default/health/project-task-configuration.json @@ -1,6 +1,7 @@ { "tenantId": "default", "moduleName": "HCM-PROJECT", + "version":"0.1", "projectConfiguration": [{ "beneficiaryTypes": [ "INDIVIDUAL", diff --git a/data/default/health/project-types.json b/data/default/health/project-types.json index fabfa9544..8482e8c43 100644 --- a/data/default/health/project-types.json +++ b/data/default/health/project-types.json @@ -1,6 +1,7 @@ { "tenantId": "default", "moduleName": "HCM-PROJECT-TYPES", + "version":"0.1", "projectTypes": [ { "id": "dbd45c31-de9e-4e62-a9b6-abb818928fd1", diff --git a/data/default/health/service-registry.json b/data/default/health/service-registry.json index 85ec2ff61..6269f8642 100644 --- a/data/default/health/service-registry.json +++ b/data/default/health/service-registry.json @@ -1,6 +1,7 @@ { "tenantId": "default", "moduleName": "HCM-SERVICE-REGISTRY", + "version":"0.1", "serviceRegistry": [ { "service": "USER", From 4c374e4cdca97e77bb6f09260761b18e3ea280b9 Mon Sep 17 00:00:00 2001 From: Naveen Date: Tue, 11 Jul 2023 13:10:40 +0530 Subject: [PATCH 23/43] added version --- data/default/health/field-app-configuration.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/default/health/field-app-configuration.json b/data/default/health/field-app-configuration.json index ee5896f32..4c688d72c 100644 --- a/data/default/health/field-app-configuration.json +++ b/data/default/health/field-app-configuration.json @@ -16,8 +16,8 @@ }, "ROW_VERSIONS": [ { - "module": "", - "version": "" + "module": "HCM-SERVICE-REGISTRY", + "version": "0.1" } ], "BANDWIDTH_BATCH_SIZE": [ From c46a3cadc333c9b7af6abdee1473245604818217 Mon Sep 17 00:00:00 2001 From: Naveen Date: Tue, 11 Jul 2023 13:20:25 +0530 Subject: [PATCH 24/43] removed version --- data/default/egov-location/boundary-data.json | 1 - data/default/egov-module-version/module-version.json | 10 ++++++++++ data/default/health/additional-field-schemas.json | 1 - data/default/health/field-app-configuration.json | 7 ------- data/default/health/project-task-configuration.json | 1 - data/default/health/project-types.json | 1 - data/default/health/service-registry.json | 1 - 7 files changed, 10 insertions(+), 12 deletions(-) create mode 100644 data/default/egov-module-version/module-version.json diff --git a/data/default/egov-location/boundary-data.json b/data/default/egov-location/boundary-data.json index f40dc8f7a..b9f501691 100644 --- a/data/default/egov-location/boundary-data.json +++ b/data/default/egov-location/boundary-data.json @@ -1,7 +1,6 @@ { "tenantId": "default", "moduleName": "egov-location", - "version":"0.1", "TenantBoundary": [ { "hierarchyType": { diff --git a/data/default/egov-module-version/module-version.json b/data/default/egov-module-version/module-version.json new file mode 100644 index 000000000..0f6736a2b --- /dev/null +++ b/data/default/egov-module-version/module-version.json @@ -0,0 +1,10 @@ +{ + "tenantId": "default", + "moduleName": "HCM-PROJECT-TYPES", + "ROW_VERSIONS": [ + { + "module": "HCM-SERVICE-REGISTRY", + "version": "0.1" + } + ] + } diff --git a/data/default/health/additional-field-schemas.json b/data/default/health/additional-field-schemas.json index 786703866..e09c677ff 100644 --- a/data/default/health/additional-field-schemas.json +++ b/data/default/health/additional-field-schemas.json @@ -1,7 +1,6 @@ { "tenantId": "default", "moduleName": "HCM-ADDITIONAL-FIELD-SCHEMAS", - "version":"0.1", "additionalFieldSchemas": [ { "schema": "INDIVIDUAL", diff --git a/data/default/health/field-app-configuration.json b/data/default/health/field-app-configuration.json index 4c688d72c..44c31ec48 100644 --- a/data/default/health/field-app-configuration.json +++ b/data/default/health/field-app-configuration.json @@ -1,7 +1,6 @@ { "tenantId": "default", "moduleName": "HCM-FIELD-APP-CONFIG", - "version":"0.1", "appConfig": [ { "NETWORK_DETECTION": "OFF | ON", @@ -14,12 +13,6 @@ "SERVICE_INTERVAL": 600, "API_CONCURRENCY": 2 }, - "ROW_VERSIONS": [ - { - "module": "HCM-SERVICE-REGISTRY", - "version": "0.1" - } - ], "BANDWIDTH_BATCH_SIZE": [ { "MIN_RANGE": 0.02, diff --git a/data/default/health/project-task-configuration.json b/data/default/health/project-task-configuration.json index 77d6a41cf..aa1db34c2 100644 --- a/data/default/health/project-task-configuration.json +++ b/data/default/health/project-task-configuration.json @@ -1,7 +1,6 @@ { "tenantId": "default", "moduleName": "HCM-PROJECT", - "version":"0.1", "projectConfiguration": [{ "beneficiaryTypes": [ "INDIVIDUAL", diff --git a/data/default/health/project-types.json b/data/default/health/project-types.json index 8482e8c43..fabfa9544 100644 --- a/data/default/health/project-types.json +++ b/data/default/health/project-types.json @@ -1,7 +1,6 @@ { "tenantId": "default", "moduleName": "HCM-PROJECT-TYPES", - "version":"0.1", "projectTypes": [ { "id": "dbd45c31-de9e-4e62-a9b6-abb818928fd1", diff --git a/data/default/health/service-registry.json b/data/default/health/service-registry.json index 6269f8642..85ec2ff61 100644 --- a/data/default/health/service-registry.json +++ b/data/default/health/service-registry.json @@ -1,7 +1,6 @@ { "tenantId": "default", "moduleName": "HCM-SERVICE-REGISTRY", - "version":"0.1", "serviceRegistry": [ { "service": "USER", From 46308c4329958edf51cc4bbb23f66890ac93469c Mon Sep 17 00:00:00 2001 From: Naveen Date: Tue, 11 Jul 2023 13:25:35 +0530 Subject: [PATCH 25/43] renamed module --- data/default/egov-module-version/module-version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/default/egov-module-version/module-version.json b/data/default/egov-module-version/module-version.json index 0f6736a2b..b65372d5c 100644 --- a/data/default/egov-module-version/module-version.json +++ b/data/default/egov-module-version/module-version.json @@ -1,6 +1,6 @@ { "tenantId": "default", - "moduleName": "HCM-PROJECT-TYPES", + "moduleName": "module-version", "ROW_VERSIONS": [ { "module": "HCM-SERVICE-REGISTRY", From f47f9d1e0674270016541733e05f27af7b2e1fc7 Mon Sep 17 00:00:00 2001 From: Naveen Date: Thu, 13 Jul 2023 16:46:30 +0530 Subject: [PATCH 26/43] updated the modules --- .../egov-module-version/module-version.json | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/data/default/egov-module-version/module-version.json b/data/default/egov-module-version/module-version.json index b65372d5c..85435f0e9 100644 --- a/data/default/egov-module-version/module-version.json +++ b/data/default/egov-module-version/module-version.json @@ -3,8 +3,16 @@ "moduleName": "module-version", "ROW_VERSIONS": [ { - "module": "HCM-SERVICE-REGISTRY", - "version": "0.1" + "module": "HCM-SERVICE-REGISTRY", + "version": "0.1" + }, + { + "module": "egov-location", + "version": "0.1" + }, + { + "module": "HCM-FIELD-APP-CONFIG", + "version": "0.1" } - ] - } + ] +} \ No newline at end of file From be48931a98de09f6c4353cf547eba05f6bbf5e17 Mon Sep 17 00:00:00 2001 From: Naveen Date: Fri, 14 Jul 2023 11:57:57 +0530 Subject: [PATCH 27/43] updated version --- data/default/egov-module-version/module-version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/default/egov-module-version/module-version.json b/data/default/egov-module-version/module-version.json index 85435f0e9..4f4ce7a9a 100644 --- a/data/default/egov-module-version/module-version.json +++ b/data/default/egov-module-version/module-version.json @@ -8,7 +8,7 @@ }, { "module": "egov-location", - "version": "0.1" + "version": "0.2" }, { "module": "HCM-FIELD-APP-CONFIG", From e624db564665c77c39460eed84bfd38cec03bab8 Mon Sep 17 00:00:00 2001 From: Naveen Date: Mon, 17 Jul 2023 11:20:20 +0530 Subject: [PATCH 28/43] resolved conflicts --- data/default/Workflow/BusinessService.json | 2 +- data/default/Workflow/BusinessServiceConfig.json | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/data/default/Workflow/BusinessService.json b/data/default/Workflow/BusinessService.json index 65fb3066d..37a69b500 100644 --- a/data/default/Workflow/BusinessService.json +++ b/data/default/Workflow/BusinessService.json @@ -169,4 +169,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/data/default/Workflow/BusinessServiceConfig.json b/data/default/Workflow/BusinessServiceConfig.json index b14d2be96..fdd815752 100644 --- a/data/default/Workflow/BusinessServiceConfig.json +++ b/data/default/Workflow/BusinessServiceConfig.json @@ -5,6 +5,13 @@ { "code": "PGR", "isStateLevel": true + },{ + "code": "NEWTL", + "isStateLevel": true + }, + { + "code": "FIRENOC", + "isStateLevel": true } ] } From 3aea541217c9974c2ad0e34b7e3c08bacf7a5dab Mon Sep 17 00:00:00 2001 From: Shiva Burade Date: Wed, 14 Jun 2023 12:49:49 +0530 Subject: [PATCH 29/43] [hlm-2953]: Added workflow service config for default --- data/default/Workflow/BusinessServiceConfig.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/data/default/Workflow/BusinessServiceConfig.json b/data/default/Workflow/BusinessServiceConfig.json index fdd815752..7d178132b 100644 --- a/data/default/Workflow/BusinessServiceConfig.json +++ b/data/default/Workflow/BusinessServiceConfig.json @@ -12,6 +12,10 @@ { "code": "FIRENOC", "isStateLevel": true + }, + { + "code": "PGR", + "isStateLevel": true } ] } From 478b45f242d14bd2baa4d8bbc8ac697182469ad1 Mon Sep 17 00:00:00 2001 From: Naveen Date: Mon, 17 Jul 2023 11:21:04 +0530 Subject: [PATCH 30/43] resolved conflicts --- data/default/Workflow/BusinessServiceConfig.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/data/default/Workflow/BusinessServiceConfig.json b/data/default/Workflow/BusinessServiceConfig.json index 7d178132b..fdd815752 100644 --- a/data/default/Workflow/BusinessServiceConfig.json +++ b/data/default/Workflow/BusinessServiceConfig.json @@ -12,10 +12,6 @@ { "code": "FIRENOC", "isStateLevel": true - }, - { - "code": "PGR", - "isStateLevel": true } ] } From 78d32e901f8d34ecc36eff4a41dbcdd811f3a953 Mon Sep 17 00:00:00 2001 From: Naveen J <83631045+naveen-egov@users.noreply.github.com> Date: Wed, 28 Jun 2023 12:13:37 +0530 Subject: [PATCH 31/43] Update field-app-configuration.json --- data/default/health/field-app-configuration.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/default/health/field-app-configuration.json b/data/default/health/field-app-configuration.json index 44c31ec48..d6da7a1cb 100644 --- a/data/default/health/field-app-configuration.json +++ b/data/default/health/field-app-configuration.json @@ -443,4 +443,4 @@ } } ] -} \ No newline at end of file +} From a985962e7deb94916183749299acc4c059f228eb Mon Sep 17 00:00:00 2001 From: Naveen Date: Tue, 11 Jul 2023 12:37:54 +0530 Subject: [PATCH 32/43] added version --- data/default/egov-location/boundary-data.json | 1 + data/default/health/additional-field-schemas.json | 1 + data/default/health/field-app-configuration.json | 9 ++++++++- data/default/health/project-task-configuration.json | 1 + data/default/health/project-types.json | 1 + data/default/health/service-registry.json | 1 + 6 files changed, 13 insertions(+), 1 deletion(-) diff --git a/data/default/egov-location/boundary-data.json b/data/default/egov-location/boundary-data.json index b9f501691..f40dc8f7a 100644 --- a/data/default/egov-location/boundary-data.json +++ b/data/default/egov-location/boundary-data.json @@ -1,6 +1,7 @@ { "tenantId": "default", "moduleName": "egov-location", + "version":"0.1", "TenantBoundary": [ { "hierarchyType": { diff --git a/data/default/health/additional-field-schemas.json b/data/default/health/additional-field-schemas.json index e09c677ff..786703866 100644 --- a/data/default/health/additional-field-schemas.json +++ b/data/default/health/additional-field-schemas.json @@ -1,6 +1,7 @@ { "tenantId": "default", "moduleName": "HCM-ADDITIONAL-FIELD-SCHEMAS", + "version":"0.1", "additionalFieldSchemas": [ { "schema": "INDIVIDUAL", diff --git a/data/default/health/field-app-configuration.json b/data/default/health/field-app-configuration.json index d6da7a1cb..ee5896f32 100644 --- a/data/default/health/field-app-configuration.json +++ b/data/default/health/field-app-configuration.json @@ -1,6 +1,7 @@ { "tenantId": "default", "moduleName": "HCM-FIELD-APP-CONFIG", + "version":"0.1", "appConfig": [ { "NETWORK_DETECTION": "OFF | ON", @@ -13,6 +14,12 @@ "SERVICE_INTERVAL": 600, "API_CONCURRENCY": 2 }, + "ROW_VERSIONS": [ + { + "module": "", + "version": "" + } + ], "BANDWIDTH_BATCH_SIZE": [ { "MIN_RANGE": 0.02, @@ -443,4 +450,4 @@ } } ] -} +} \ No newline at end of file diff --git a/data/default/health/project-task-configuration.json b/data/default/health/project-task-configuration.json index aa1db34c2..77d6a41cf 100644 --- a/data/default/health/project-task-configuration.json +++ b/data/default/health/project-task-configuration.json @@ -1,6 +1,7 @@ { "tenantId": "default", "moduleName": "HCM-PROJECT", + "version":"0.1", "projectConfiguration": [{ "beneficiaryTypes": [ "INDIVIDUAL", diff --git a/data/default/health/project-types.json b/data/default/health/project-types.json index fabfa9544..8482e8c43 100644 --- a/data/default/health/project-types.json +++ b/data/default/health/project-types.json @@ -1,6 +1,7 @@ { "tenantId": "default", "moduleName": "HCM-PROJECT-TYPES", + "version":"0.1", "projectTypes": [ { "id": "dbd45c31-de9e-4e62-a9b6-abb818928fd1", diff --git a/data/default/health/service-registry.json b/data/default/health/service-registry.json index 85ec2ff61..6269f8642 100644 --- a/data/default/health/service-registry.json +++ b/data/default/health/service-registry.json @@ -1,6 +1,7 @@ { "tenantId": "default", "moduleName": "HCM-SERVICE-REGISTRY", + "version":"0.1", "serviceRegistry": [ { "service": "USER", From 8cf27799fdcaa1022a059ff036c1b98f56fb270c Mon Sep 17 00:00:00 2001 From: Naveen Date: Tue, 11 Jul 2023 13:10:40 +0530 Subject: [PATCH 33/43] added version --- data/default/health/field-app-configuration.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/default/health/field-app-configuration.json b/data/default/health/field-app-configuration.json index ee5896f32..4c688d72c 100644 --- a/data/default/health/field-app-configuration.json +++ b/data/default/health/field-app-configuration.json @@ -16,8 +16,8 @@ }, "ROW_VERSIONS": [ { - "module": "", - "version": "" + "module": "HCM-SERVICE-REGISTRY", + "version": "0.1" } ], "BANDWIDTH_BATCH_SIZE": [ From 186b89e3cd0065ab7bb6897d8de4644104109000 Mon Sep 17 00:00:00 2001 From: Naveen Date: Mon, 17 Jul 2023 11:21:40 +0530 Subject: [PATCH 34/43] resolved conflicts --- data/default/egov-location/boundary-data.json | 1 - data/default/egov-module-version/module-version.json | 2 +- data/default/health/additional-field-schemas.json | 1 - data/default/health/field-app-configuration.json | 7 ------- data/default/health/project-task-configuration.json | 1 - data/default/health/project-types.json | 1 - data/default/health/service-registry.json | 1 - 7 files changed, 1 insertion(+), 13 deletions(-) diff --git a/data/default/egov-location/boundary-data.json b/data/default/egov-location/boundary-data.json index f40dc8f7a..b9f501691 100644 --- a/data/default/egov-location/boundary-data.json +++ b/data/default/egov-location/boundary-data.json @@ -1,7 +1,6 @@ { "tenantId": "default", "moduleName": "egov-location", - "version":"0.1", "TenantBoundary": [ { "hierarchyType": { diff --git a/data/default/egov-module-version/module-version.json b/data/default/egov-module-version/module-version.json index 4f4ce7a9a..6159db684 100644 --- a/data/default/egov-module-version/module-version.json +++ b/data/default/egov-module-version/module-version.json @@ -15,4 +15,4 @@ "version": "0.1" } ] -} \ No newline at end of file +} diff --git a/data/default/health/additional-field-schemas.json b/data/default/health/additional-field-schemas.json index 786703866..e09c677ff 100644 --- a/data/default/health/additional-field-schemas.json +++ b/data/default/health/additional-field-schemas.json @@ -1,7 +1,6 @@ { "tenantId": "default", "moduleName": "HCM-ADDITIONAL-FIELD-SCHEMAS", - "version":"0.1", "additionalFieldSchemas": [ { "schema": "INDIVIDUAL", diff --git a/data/default/health/field-app-configuration.json b/data/default/health/field-app-configuration.json index 4c688d72c..44c31ec48 100644 --- a/data/default/health/field-app-configuration.json +++ b/data/default/health/field-app-configuration.json @@ -1,7 +1,6 @@ { "tenantId": "default", "moduleName": "HCM-FIELD-APP-CONFIG", - "version":"0.1", "appConfig": [ { "NETWORK_DETECTION": "OFF | ON", @@ -14,12 +13,6 @@ "SERVICE_INTERVAL": 600, "API_CONCURRENCY": 2 }, - "ROW_VERSIONS": [ - { - "module": "HCM-SERVICE-REGISTRY", - "version": "0.1" - } - ], "BANDWIDTH_BATCH_SIZE": [ { "MIN_RANGE": 0.02, diff --git a/data/default/health/project-task-configuration.json b/data/default/health/project-task-configuration.json index 77d6a41cf..aa1db34c2 100644 --- a/data/default/health/project-task-configuration.json +++ b/data/default/health/project-task-configuration.json @@ -1,7 +1,6 @@ { "tenantId": "default", "moduleName": "HCM-PROJECT", - "version":"0.1", "projectConfiguration": [{ "beneficiaryTypes": [ "INDIVIDUAL", diff --git a/data/default/health/project-types.json b/data/default/health/project-types.json index 8482e8c43..fabfa9544 100644 --- a/data/default/health/project-types.json +++ b/data/default/health/project-types.json @@ -1,7 +1,6 @@ { "tenantId": "default", "moduleName": "HCM-PROJECT-TYPES", - "version":"0.1", "projectTypes": [ { "id": "dbd45c31-de9e-4e62-a9b6-abb818928fd1", diff --git a/data/default/health/service-registry.json b/data/default/health/service-registry.json index 6269f8642..85ec2ff61 100644 --- a/data/default/health/service-registry.json +++ b/data/default/health/service-registry.json @@ -1,7 +1,6 @@ { "tenantId": "default", "moduleName": "HCM-SERVICE-REGISTRY", - "version":"0.1", "serviceRegistry": [ { "service": "USER", From 0cef071e37b8c47407e7613e1d0d8a3a5f4e57c6 Mon Sep 17 00:00:00 2001 From: Naveen Date: Mon, 17 Jul 2023 11:24:45 +0530 Subject: [PATCH 35/43] resolved conflicts --- data/default/Workflow/BusinessService.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/default/Workflow/BusinessService.json b/data/default/Workflow/BusinessService.json index 37a69b500..65fb3066d 100644 --- a/data/default/Workflow/BusinessService.json +++ b/data/default/Workflow/BusinessService.json @@ -169,4 +169,4 @@ ] } ] -} \ No newline at end of file +} From 241a607cfb81613c011f22dd8a90b9fb4493a8a4 Mon Sep 17 00:00:00 2001 From: Shiva Burade Date: Wed, 14 Jun 2023 12:49:49 +0530 Subject: [PATCH 36/43] [hlm-2953]: Added workflow service config for default --- data/default/Workflow/BusinessServiceConfig.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/data/default/Workflow/BusinessServiceConfig.json b/data/default/Workflow/BusinessServiceConfig.json index fdd815752..7d178132b 100644 --- a/data/default/Workflow/BusinessServiceConfig.json +++ b/data/default/Workflow/BusinessServiceConfig.json @@ -12,6 +12,10 @@ { "code": "FIRENOC", "isStateLevel": true + }, + { + "code": "PGR", + "isStateLevel": true } ] } From d8efc9872736fa735473b7342769c022e69bdfba Mon Sep 17 00:00:00 2001 From: Naveen Date: Mon, 17 Jul 2023 11:25:17 +0530 Subject: [PATCH 37/43] resolved conflicts --- data/default/Workflow/BusinessServiceConfig.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/data/default/Workflow/BusinessServiceConfig.json b/data/default/Workflow/BusinessServiceConfig.json index 7d178132b..fdd815752 100644 --- a/data/default/Workflow/BusinessServiceConfig.json +++ b/data/default/Workflow/BusinessServiceConfig.json @@ -12,10 +12,6 @@ { "code": "FIRENOC", "isStateLevel": true - }, - { - "code": "PGR", - "isStateLevel": true } ] } From e0daafacd5c37b2859d61222e89234d6f6136497 Mon Sep 17 00:00:00 2001 From: Naveen J <83631045+naveen-egov@users.noreply.github.com> Date: Wed, 28 Jun 2023 12:13:37 +0530 Subject: [PATCH 38/43] Update field-app-configuration.json --- data/default/health/field-app-configuration.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/default/health/field-app-configuration.json b/data/default/health/field-app-configuration.json index 44c31ec48..d6da7a1cb 100644 --- a/data/default/health/field-app-configuration.json +++ b/data/default/health/field-app-configuration.json @@ -443,4 +443,4 @@ } } ] -} \ No newline at end of file +} From fa4add59ca87a4bff79ee115609bc52c8f325666 Mon Sep 17 00:00:00 2001 From: Naveen Date: Tue, 11 Jul 2023 12:37:54 +0530 Subject: [PATCH 39/43] added version --- data/default/egov-location/boundary-data.json | 1 + data/default/health/additional-field-schemas.json | 1 + data/default/health/field-app-configuration.json | 9 ++++++++- data/default/health/project-task-configuration.json | 1 + data/default/health/project-types.json | 1 + data/default/health/service-registry.json | 1 + 6 files changed, 13 insertions(+), 1 deletion(-) diff --git a/data/default/egov-location/boundary-data.json b/data/default/egov-location/boundary-data.json index b9f501691..f40dc8f7a 100644 --- a/data/default/egov-location/boundary-data.json +++ b/data/default/egov-location/boundary-data.json @@ -1,6 +1,7 @@ { "tenantId": "default", "moduleName": "egov-location", + "version":"0.1", "TenantBoundary": [ { "hierarchyType": { diff --git a/data/default/health/additional-field-schemas.json b/data/default/health/additional-field-schemas.json index e09c677ff..786703866 100644 --- a/data/default/health/additional-field-schemas.json +++ b/data/default/health/additional-field-schemas.json @@ -1,6 +1,7 @@ { "tenantId": "default", "moduleName": "HCM-ADDITIONAL-FIELD-SCHEMAS", + "version":"0.1", "additionalFieldSchemas": [ { "schema": "INDIVIDUAL", diff --git a/data/default/health/field-app-configuration.json b/data/default/health/field-app-configuration.json index d6da7a1cb..ee5896f32 100644 --- a/data/default/health/field-app-configuration.json +++ b/data/default/health/field-app-configuration.json @@ -1,6 +1,7 @@ { "tenantId": "default", "moduleName": "HCM-FIELD-APP-CONFIG", + "version":"0.1", "appConfig": [ { "NETWORK_DETECTION": "OFF | ON", @@ -13,6 +14,12 @@ "SERVICE_INTERVAL": 600, "API_CONCURRENCY": 2 }, + "ROW_VERSIONS": [ + { + "module": "", + "version": "" + } + ], "BANDWIDTH_BATCH_SIZE": [ { "MIN_RANGE": 0.02, @@ -443,4 +450,4 @@ } } ] -} +} \ No newline at end of file diff --git a/data/default/health/project-task-configuration.json b/data/default/health/project-task-configuration.json index aa1db34c2..77d6a41cf 100644 --- a/data/default/health/project-task-configuration.json +++ b/data/default/health/project-task-configuration.json @@ -1,6 +1,7 @@ { "tenantId": "default", "moduleName": "HCM-PROJECT", + "version":"0.1", "projectConfiguration": [{ "beneficiaryTypes": [ "INDIVIDUAL", diff --git a/data/default/health/project-types.json b/data/default/health/project-types.json index fabfa9544..8482e8c43 100644 --- a/data/default/health/project-types.json +++ b/data/default/health/project-types.json @@ -1,6 +1,7 @@ { "tenantId": "default", "moduleName": "HCM-PROJECT-TYPES", + "version":"0.1", "projectTypes": [ { "id": "dbd45c31-de9e-4e62-a9b6-abb818928fd1", diff --git a/data/default/health/service-registry.json b/data/default/health/service-registry.json index 85ec2ff61..6269f8642 100644 --- a/data/default/health/service-registry.json +++ b/data/default/health/service-registry.json @@ -1,6 +1,7 @@ { "tenantId": "default", "moduleName": "HCM-SERVICE-REGISTRY", + "version":"0.1", "serviceRegistry": [ { "service": "USER", From 5b040076addf6d821bdbdd1d36aecd5dacec413c Mon Sep 17 00:00:00 2001 From: Naveen Date: Tue, 11 Jul 2023 13:10:40 +0530 Subject: [PATCH 40/43] added version --- data/default/health/field-app-configuration.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/default/health/field-app-configuration.json b/data/default/health/field-app-configuration.json index ee5896f32..4c688d72c 100644 --- a/data/default/health/field-app-configuration.json +++ b/data/default/health/field-app-configuration.json @@ -16,8 +16,8 @@ }, "ROW_VERSIONS": [ { - "module": "", - "version": "" + "module": "HCM-SERVICE-REGISTRY", + "version": "0.1" } ], "BANDWIDTH_BATCH_SIZE": [ From 216f75681f5966eb41a78197f2c785ed8e1246ef Mon Sep 17 00:00:00 2001 From: Naveen Date: Mon, 17 Jul 2023 11:25:29 +0530 Subject: [PATCH 41/43] resolved conflicts --- data/default/egov-location/boundary-data.json | 1 - data/default/health/additional-field-schemas.json | 1 - data/default/health/field-app-configuration.json | 7 ------- data/default/health/project-task-configuration.json | 1 - data/default/health/project-types.json | 1 - data/default/health/service-registry.json | 1 - 6 files changed, 12 deletions(-) diff --git a/data/default/egov-location/boundary-data.json b/data/default/egov-location/boundary-data.json index f40dc8f7a..b9f501691 100644 --- a/data/default/egov-location/boundary-data.json +++ b/data/default/egov-location/boundary-data.json @@ -1,7 +1,6 @@ { "tenantId": "default", "moduleName": "egov-location", - "version":"0.1", "TenantBoundary": [ { "hierarchyType": { diff --git a/data/default/health/additional-field-schemas.json b/data/default/health/additional-field-schemas.json index 786703866..e09c677ff 100644 --- a/data/default/health/additional-field-schemas.json +++ b/data/default/health/additional-field-schemas.json @@ -1,7 +1,6 @@ { "tenantId": "default", "moduleName": "HCM-ADDITIONAL-FIELD-SCHEMAS", - "version":"0.1", "additionalFieldSchemas": [ { "schema": "INDIVIDUAL", diff --git a/data/default/health/field-app-configuration.json b/data/default/health/field-app-configuration.json index 4c688d72c..44c31ec48 100644 --- a/data/default/health/field-app-configuration.json +++ b/data/default/health/field-app-configuration.json @@ -1,7 +1,6 @@ { "tenantId": "default", "moduleName": "HCM-FIELD-APP-CONFIG", - "version":"0.1", "appConfig": [ { "NETWORK_DETECTION": "OFF | ON", @@ -14,12 +13,6 @@ "SERVICE_INTERVAL": 600, "API_CONCURRENCY": 2 }, - "ROW_VERSIONS": [ - { - "module": "HCM-SERVICE-REGISTRY", - "version": "0.1" - } - ], "BANDWIDTH_BATCH_SIZE": [ { "MIN_RANGE": 0.02, diff --git a/data/default/health/project-task-configuration.json b/data/default/health/project-task-configuration.json index 77d6a41cf..aa1db34c2 100644 --- a/data/default/health/project-task-configuration.json +++ b/data/default/health/project-task-configuration.json @@ -1,7 +1,6 @@ { "tenantId": "default", "moduleName": "HCM-PROJECT", - "version":"0.1", "projectConfiguration": [{ "beneficiaryTypes": [ "INDIVIDUAL", diff --git a/data/default/health/project-types.json b/data/default/health/project-types.json index 8482e8c43..fabfa9544 100644 --- a/data/default/health/project-types.json +++ b/data/default/health/project-types.json @@ -1,7 +1,6 @@ { "tenantId": "default", "moduleName": "HCM-PROJECT-TYPES", - "version":"0.1", "projectTypes": [ { "id": "dbd45c31-de9e-4e62-a9b6-abb818928fd1", diff --git a/data/default/health/service-registry.json b/data/default/health/service-registry.json index 6269f8642..85ec2ff61 100644 --- a/data/default/health/service-registry.json +++ b/data/default/health/service-registry.json @@ -1,7 +1,6 @@ { "tenantId": "default", "moduleName": "HCM-SERVICE-REGISTRY", - "version":"0.1", "serviceRegistry": [ { "service": "USER", From 4a40785e1125cfe1886a8b36806011490de5f61a Mon Sep 17 00:00:00 2001 From: Naveen Date: Mon, 17 Jul 2023 11:25:39 +0530 Subject: [PATCH 42/43] resolved conflicts --- data/default/egov-module-version/module-version.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/data/default/egov-module-version/module-version.json b/data/default/egov-module-version/module-version.json index 6159db684..240a8c0f7 100644 --- a/data/default/egov-module-version/module-version.json +++ b/data/default/egov-module-version/module-version.json @@ -8,11 +8,19 @@ }, { "module": "egov-location", +<<<<<<< HEAD "version": "0.2" +======= + "version": "0.1" +>>>>>>> 231f6833 (updated the modules) }, { "module": "HCM-FIELD-APP-CONFIG", "version": "0.1" } ] +<<<<<<< HEAD +} +======= } +>>>>>>> 231f6833 (updated the modules) From 2bb5b01eec083390d441bbbdeef8c68a08202051 Mon Sep 17 00:00:00 2001 From: Naveen Date: Mon, 17 Jul 2023 11:25:56 +0530 Subject: [PATCH 43/43] resolved conflicts --- data/default/egov-module-version/module-version.json | 8 -------- 1 file changed, 8 deletions(-) diff --git a/data/default/egov-module-version/module-version.json b/data/default/egov-module-version/module-version.json index 240a8c0f7..6159db684 100644 --- a/data/default/egov-module-version/module-version.json +++ b/data/default/egov-module-version/module-version.json @@ -8,19 +8,11 @@ }, { "module": "egov-location", -<<<<<<< HEAD "version": "0.2" -======= - "version": "0.1" ->>>>>>> 231f6833 (updated the modules) }, { "module": "HCM-FIELD-APP-CONFIG", "version": "0.1" } ] -<<<<<<< HEAD -} -======= } ->>>>>>> 231f6833 (updated the modules)