Merge pull request #131 from upyog/2.8_upgrade

Merge mdms changes for Fire NOC tax and UI redirection issue
upyog · Jun 16, 2023 · 350f94a · 350f94a
2 parents 2714409 + 39e63ba
commit 350f94a
Show file tree

Hide file tree

Showing 4 changed files with 79 additions and 55 deletions.
diff --git a/data/pg/ACCESSCONTROL-ACTIONS-TEST/actions-test.json b/data/pg/ACCESSCONTROL-ACTIONS-TEST/actions-test.json
@@ -13451,7 +13451,7 @@
    },
    {
       "id": 2425,
-      "name": "FirenocCitizen",
+      "name": "Firenoc Citizen Home",
       "url": "digit-ui-card",
       "displayName": "FireNoc Search",
       "orderNumber": 1,
@@ -13469,7 +13469,7 @@
    },
    {
       "id": 2426,
-      "name": "BirthCitizen",
+      "name": "Birth Certificate Home",
       "url": "digit-ui-card",
       "displayName": "Birth Search",
       "orderNumber": 1,
@@ -13487,7 +13487,7 @@
    },
    {
       "id": 2427,
-      "name": "DeathCitizen",
+      "name": "Death Certificate Home",
       "url": "digit-ui-card",
       "displayName": "Death Search",
       "orderNumber": 1,

diff --git a/data/pg/DataSecurity/DecryptionABAC.json b/data/pg/DataSecurity/DecryptionABAC.json
@@ -325,22 +325,6 @@
         }
       ]
     },
-    {
-      "key": "MiscReceiptCB",
-      "roleAttributeAccessList": [
-        {
-          "roleCode": "EMPLOYEE",
-          "attributeAccessList": [
-            {
-              "attribute": {
-                "jsonPath": "*/name"
-              },
-              "accessType": "PLAIN"
-            }
-          ]
-        }
-      ]
-    },
     {
       "key": "LMEPerformanceReport",
       "roleAttributeAccessList": [
@@ -440,6 +424,38 @@
         }
       ]
     },
+    {
+      "key": "MiscReceiptCB",
+      "roleAttributeAccessList": [
+        {
+          "roleCode": "EMPLOYEE",
+          "attributeAccessList": [
+            {
+              "attribute": {
+                "jsonPath": "*/name"
+              },
+              "accessType": "PLAIN"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "key": "MCollectReceiptRegister",
+      "roleAttributeAccessList": [
+        {
+          "roleCode": "EMPLOYEE",
+          "attributeAccessList": [
+            {
+              "attribute": {
+                "jsonPath": "*/name"
+              },
+              "accessType": "PLAIN"
+            }
+          ]
+        }
+      ]
+    },
     {
       "key": "StateLevelTradeLicenseRegistryReport",
       "roleAttributeAccessList": [
@@ -1434,22 +1450,6 @@
         }
       ]
     },
-    {
-      "key": "MCollectReceiptRegister",
-      "roleAttributeAccessList": [
-        {
-          "roleCode": "EMPLOYEE",
-          "attributeAccessList": [
-            {
-              "attribute": {
-                "jsonPath": "*/name"
-              },
-              "accessType": "PLAIN"
-            }
-          ]
-        }
-      ]
-    },
     {
       "key": "TradeLicenseDailyCollectionReport",
       "roleAttributeAccessList": [

diff --git a/data/pg/DataSecurity/SecurityPolicy.json b/data/pg/DataSecurity/SecurityPolicy.json
@@ -285,24 +285,6 @@
 
         ]
       },
-      {
-        "model": "MiscReceiptCB",
-        "uniqueIdentifier": {
-          "name": "uuid",
-          "jsonPath": "/uuid"
-        },
-        "attributes": [
-          {
-            "name": "name",
-            "jsonPath": "name",
-            "patternId": "002",
-            "defaultVisibility": "PLAIN"
-          }
-        ],
-        "roleBasedDecryptionPolicy": [
-
-        ]
-      },
       {
         "model": "waterOpenSearch",
         "uniqueIdentifier": {
@@ -762,6 +744,48 @@
 
         ]
       },
+      {
+        "model": "MiscReceiptCB",
+        "uniqueIdentifier": {
+          "name": "uuid",
+          "jsonPath": "/uuid"
+        },
+        "attributes": [
+          {
+            "name": "name",
+            "jsonPath": "name",
+            "patternId": "002",
+            "defaultVisibility": "PLAIN"
+          }
+        ],
+        "roleBasedDecryptionPolicy": [
+
+        ]
+      },
+      {
+        "model": "MCollectReceiptRegister",
+        "uniqueIdentifier": {
+          "name": "uuid",
+          "jsonPath": "/uuid"
+        },
+        "attributes": [
+          {
+            "name": "name",
+            "jsonPath": "name",
+            "patternId": "002",
+            "defaultVisibility": "PLAIN"
+          },
+          {
+            "name": "consumername",
+            "jsonPath": "consumername",
+            "patternId": "002",
+            "defaultVisibility": "PLAIN"
+          }
+        ],
+        "roleBasedDecryptionPolicy": [
+
+        ]
+      },
       {
         "model": "StateTradeLicenseCancelledRegistryReport",
         "uniqueIdentifier": {

diff --git a/data/pg/egf-master/FinancialYear.json b/data/pg/egf-master/FinancialYear.json
@@ -64,8 +64,8 @@
       "finYearRange":  "2023-24",
       "name":  "2023-24",
       "code":  "2023-24",
-      "startingDate": 1680307199000,
-      "endingDate": 1711929599000,
+      "startingDate": 1680287400000,
+      "endingDate": 1711909799000,
       "active": true,
       "isActiveForPosting": false,
       "isClosed": false,