diff --git a/egov-persister/apportion-persister.yml b/egov-persister/apportion-persister.yml index d17218c2..094cbcda 100644 --- a/egov-persister/apportion-persister.yml +++ b/egov-persister/apportion-persister.yml @@ -1,250 +1,250 @@ serviceMaps: serviceName: apportion-services mappings: - - version: 1.0 - description: Persists apportioning request - fromTopic: save-apportion-request - isTransaction: true - isAuditEnabled: true - module: APPORTION - objecIdJsonPath: $.id - tenantIdJsonPath: $.tenantId - auditAttributeBasePath: Bills.* - queryMaps: + - version: 1.0 + description: Persists apportioning request + fromTopic: save-apportion-request + isTransaction: true + isAuditEnabled: true + module: APPORTION + objecIdJsonPath: $.id + tenantIdJsonPath: $.tenantId + auditAttributeBasePath: Bills.* + queryMaps: - - query: INSERT INTO eg_appr_bills_request(billId,tenantid,mobileNumber,payerName,payerAddress,payerEmail,paidBy,taxAndPayments,isActive,isCancelled,billDetails,createdBy,createdTime) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?) - basePath: Bills.* - jsonMaps: - - jsonPath: $.Bills.*.id + - query: INSERT INTO eg_appr_bills_request(billId,tenantid,mobileNumber,payerName,payerAddress,payerEmail,paidBy,taxAndPayments,isActive,isCancelled,billDetails,createdBy,createdTime) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?) + basePath: Bills.* + jsonMaps: + - jsonPath: $.Bills.*.id - - jsonPath: $.Bills.*.tenantId + - jsonPath: $.Bills.*.tenantId - - jsonPath: $.Bills.*.mobileNumber + - jsonPath: $.Bills.*.mobileNumber - - jsonPath: $.Bills.*.payerName + - jsonPath: $.Bills.*.payerName - - jsonPath: $.Bills.*.payerAddress + - jsonPath: $.Bills.*.payerAddress - - jsonPath: $.Bills.*.payerEmail + - jsonPath: $.Bills.*.payerEmail - - jsonPath: $.Bills.*.paidBy + - jsonPath: $.Bills.*.paidBy - - jsonPath: $.Bills.*.taxAndPayments - type: JSON - dbType: JSONB + - jsonPath: $.Bills.*.taxAndPayments + type: JSON + dbType: JSONB - - jsonPath: $.Bills.*.isActive + - jsonPath: $.Bills.*.isActive - - jsonPath: $.Bills.*.isCancelled + - jsonPath: $.Bills.*.isCancelled - - jsonPath: $.Bills.*.billDetails - type: JSON - dbType: JSONB + - jsonPath: $.Bills.*.billDetails + type: JSON + dbType: JSONB - - jsonPath: $.Bills.*.auditDetails.createdBy + - jsonPath: $.Bills.*.auditDetails.createdBy - - jsonPath: $.Bills.*.auditDetails.createdTime + - jsonPath: $.Bills.*.auditDetails.createdTime - - version: 1.0 - description: Persists apportioning response - fromTopic: save-apportion-response - isTransaction: true - isAuditEnabled: true - module: APPORTION - objecIdJsonPath: $.id - tenantIdJsonPath: $.tenantId - auditAttributeBasePath: Bills.* - queryMaps: + - version: 1.0 + description: Persists apportioning response + fromTopic: save-apportion-response + isTransaction: true + isAuditEnabled: true + module: APPORTION + objecIdJsonPath: $.id + tenantIdJsonPath: $.tenantId + auditAttributeBasePath: Bills.* + queryMaps: - - query: INSERT INTO eg_appr_bills_response(billId,tenantid,mobileNumber,payerName,payerAddress,payerEmail,paidBy,taxAndPayments,isActive,isCancelled,billDetails,createdBy,createdTime) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?) - basePath: Bills.* - jsonMaps: - - jsonPath: $.Bills.*.id + - query: INSERT INTO eg_appr_bills_response(billId,tenantid,mobileNumber,payerName,payerAddress,payerEmail,paidBy,taxAndPayments,isActive,isCancelled,billDetails,createdBy,createdTime) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?) + basePath: Bills.* + jsonMaps: + - jsonPath: $.Bills.*.id - - jsonPath: $.Bills.*.tenantId + - jsonPath: $.Bills.*.tenantId - - jsonPath: $.Bills.*.mobileNumber + - jsonPath: $.Bills.*.mobileNumber - - jsonPath: $.Bills.*.payerName + - jsonPath: $.Bills.*.payerName - - jsonPath: $.Bills.*.payerAddress + - jsonPath: $.Bills.*.payerAddress - - jsonPath: $.Bills.*.payerEmail + - jsonPath: $.Bills.*.payerEmail - - jsonPath: $.Bills.*.paidBy + - jsonPath: $.Bills.*.paidBy - - jsonPath: $.Bills.*.taxAndPayments - type: JSON - dbType: JSONB + - jsonPath: $.Bills.*.taxAndPayments + type: JSON + dbType: JSONB - - jsonPath: $.Bills.*.isActive + - jsonPath: $.Bills.*.isActive - - jsonPath: $.Bills.*.isCancelled + - jsonPath: $.Bills.*.isCancelled - - jsonPath: $.Bills.*.billDetails - type: JSON - dbType: JSONB + - jsonPath: $.Bills.*.billDetails + type: JSON + dbType: JSONB - - jsonPath: $.Bills.*.auditDetails.createdBy + - jsonPath: $.Bills.*.auditDetails.createdBy - - jsonPath: $.Bills.*.auditDetails.createdTime + - jsonPath: $.Bills.*.auditDetails.createdTime - - version: 1.0 - description: Persists apportioning request - fromTopic: save-apportion-bill-request - isAuditEnabled: true - module: APPORTION - objecIdJsonPath: $.id - tenantIdJsonPath: $.tenantId - auditAttributeBasePath: Bills.* - isTransaction: true - queryMaps: + - version: 1.0 + description: Persists apportioning request + fromTopic: save-apportion-bill-request + isAuditEnabled: true + module: APPORTION + objecIdJsonPath: $.id + tenantIdJsonPath: $.tenantId + auditAttributeBasePath: Bills.* + isTransaction: true + queryMaps: - - query: INSERT INTO eg_appr_bills_request(billId,tenantid,mobileNumber,payerName,payerAddress,payerEmail,paidBy,taxAndPayments,isActive,isCancelled,billDetails,createdBy,createdTime) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?) - basePath: Bills.* - jsonMaps: - - jsonPath: $.Bills.*.id + - query: INSERT INTO eg_appr_bills_request(billId,tenantid,mobileNumber,payerName,payerAddress,payerEmail,paidBy,taxAndPayments,isActive,isCancelled,billDetails,createdBy,createdTime) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?) + basePath: Bills.* + jsonMaps: + - jsonPath: $.Bills.*.id - - jsonPath: $.Bills.*.tenantId + - jsonPath: $.Bills.*.tenantId - - jsonPath: $.Bills.*.mobileNumber + - jsonPath: $.Bills.*.mobileNumber - - jsonPath: $.Bills.*.payerName + - jsonPath: $.Bills.*.payerName - - jsonPath: $.Bills.*.payerAddress + - jsonPath: $.Bills.*.payerAddress - - jsonPath: $.Bills.*.payerEmail + - jsonPath: $.Bills.*.payerEmail - - jsonPath: $.Bills.*.paidBy + - jsonPath: $.Bills.*.paidBy - - jsonPath: $.Bills.*.taxAndPayments - type: JSON - dbType: JSONB + - jsonPath: $.Bills.*.taxAndPayments + type: JSON + dbType: JSONB - - jsonPath: $.Bills.*.isActive + - jsonPath: $.Bills.*.isActive - - jsonPath: $.Bills.*.isCancelled + - jsonPath: $.Bills.*.isCancelled - - jsonPath: $.Bills.*.billDetails - type: JSON - dbType: JSONB + - jsonPath: $.Bills.*.billDetails + type: JSON + dbType: JSONB - - jsonPath: $.Bills.*.auditDetails.createdBy + - jsonPath: $.Bills.*.auditDetails.createdBy - - jsonPath: $.Bills.*.auditDetails.createdTime + - jsonPath: $.Bills.*.auditDetails.createdTime - - version: 1.0 - description: Persists apportioning response - fromTopic: save-apportion-bill-response - isTransaction: true - isAuditEnabled: true - module: APPORTION - objecIdJsonPath: $.id - tenantIdJsonPath: $.tenantId - auditAttributeBasePath: Bills.* - queryMaps: + - version: 1.0 + description: Persists apportioning response + fromTopic: save-apportion-bill-response + isTransaction: true + isAuditEnabled: true + module: APPORTION + objecIdJsonPath: $.id + tenantIdJsonPath: $.tenantId + auditAttributeBasePath: Bills.* + queryMaps: - - query: INSERT INTO eg_appr_bills_response(billId,tenantid,mobileNumber,payerName,payerAddress,payerEmail,paidBy,taxAndPayments,isActive,isCancelled,billDetails,createdBy,createdTime) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?) - basePath: Bills.* - jsonMaps: - - jsonPath: $.Bills.*.id + - query: INSERT INTO eg_appr_bills_response(billId,tenantid,mobileNumber,payerName,payerAddress,payerEmail,paidBy,taxAndPayments,isActive,isCancelled,billDetails,createdBy,createdTime) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?) + basePath: Bills.* + jsonMaps: + - jsonPath: $.Bills.*.id - - jsonPath: $.Bills.*.tenantId + - jsonPath: $.Bills.*.tenantId - - jsonPath: $.Bills.*.mobileNumber + - jsonPath: $.Bills.*.mobileNumber - - jsonPath: $.Bills.*.payerName + - jsonPath: $.Bills.*.payerName - - jsonPath: $.Bills.*.payerAddress + - jsonPath: $.Bills.*.payerAddress - - jsonPath: $.Bills.*.payerEmail + - jsonPath: $.Bills.*.payerEmail - - jsonPath: $.Bills.*.paidBy + - jsonPath: $.Bills.*.paidBy - - jsonPath: $.Bills.*.taxAndPayments - type: JSON - dbType: JSONB + - jsonPath: $.Bills.*.taxAndPayments + type: JSON + dbType: JSONB - - jsonPath: $.Bills.*.isActive + - jsonPath: $.Bills.*.isActive - - jsonPath: $.Bills.*.isCancelled + - jsonPath: $.Bills.*.isCancelled - - jsonPath: $.Bills.*.billDetails - type: JSON - dbType: JSONB + - jsonPath: $.Bills.*.billDetails + type: JSON + dbType: JSONB - - jsonPath: $.Bills.*.auditDetails.createdBy + - jsonPath: $.Bills.*.auditDetails.createdBy - - jsonPath: $.Bills.*.auditDetails.createdTime + - jsonPath: $.Bills.*.auditDetails.createdTime - - version: 1.0 - description: Persists apportioning request - fromTopic: save-apportion-demand-request - isTransaction: true - isAuditEnabled: true - module: APPORTION - objecIdJsonPath: $.id - tenantIdJsonPath: $.tenantId - auditAttributeBasePath: Demands.* - queryMaps: + - version: 1.0 + description: Persists apportioning request + fromTopic: save-apportion-demand-request + isTransaction: true + isAuditEnabled: true + module: APPORTION + objecIdJsonPath: $.id + tenantIdJsonPath: $.tenantId + auditAttributeBasePath: Demands.* + queryMaps: - - query: INSERT INTO eg_appr_demand_request(demandId,tenantid,consumerCode,demandDetails,taxPeriodFrom,taxPeriodTo,status,createdBy,createdTime) VALUES (?,?,?,?,?,?,?,?,?) - basePath: Demands.* - jsonMaps: - - jsonPath: $.Demands.*.id + - query: INSERT INTO eg_appr_demand_request(demandId,tenantid,consumerCode,demandDetails,taxPeriodFrom,taxPeriodTo,status,createdBy,createdTime) VALUES (?,?,?,?,?,?,?,?,?) + basePath: Demands.* + jsonMaps: + - jsonPath: $.Demands.*.id - - jsonPath: $.Demands.*.tenantId + - jsonPath: $.Demands.*.tenantId - - jsonPath: $.Demands.*.consumerCode + - jsonPath: $.Demands.*.consumerCode - - jsonPath: $.Demands.*.demandDetails - type: JSON - dbType: JSONB + - jsonPath: $.Demands.*.demandDetails + type: JSON + dbType: JSONB - - jsonPath: $.Demands.*.taxPeriodFrom + - jsonPath: $.Demands.*.taxPeriodFrom - - jsonPath: $.Demands.*.taxPeriodTo + - jsonPath: $.Demands.*.taxPeriodTo - - jsonPath: $.Demands.*.status + - jsonPath: $.Demands.*.status - - jsonPath: $.Demands.*.auditDetails.createdBy + - jsonPath: $.Demands.*.auditDetails.createdBy - - jsonPath: $.Demands.*.auditDetails.createdTime + - jsonPath: $.Demands.*.auditDetails.createdTime - - version: 1.0 - description: Persists apportioning response - fromTopic: save-apportion-demand-response - isTransaction: true - isAuditEnabled: true - module: APPORTION - objecIdJsonPath: $.id - tenantIdJsonPath: $.tenantId - auditAttributeBasePath: Demands.* - queryMaps: + - version: 1.0 + description: Persists apportioning response + fromTopic: save-apportion-demand-response + isTransaction: true + isAuditEnabled: true + module: APPORTION + objecIdJsonPath: $.id + tenantIdJsonPath: $.tenantId + auditAttributeBasePath: Demands.* + queryMaps: - - query: INSERT INTO eg_appr_demand_response(demandId,tenantid,consumerCode,demandDetails,taxPeriodFrom,taxPeriodTo,status,createdBy,createdTime) VALUES (?,?,?,?,?,?,?,?,?) - basePath: Demands.* - jsonMaps: - - jsonPath: $.Demands.*.id + - query: INSERT INTO eg_appr_demand_response(demandId,tenantid,consumerCode,demandDetails,taxPeriodFrom,taxPeriodTo,status,createdBy,createdTime) VALUES (?,?,?,?,?,?,?,?,?) + basePath: Demands.* + jsonMaps: + - jsonPath: $.Demands.*.id - - jsonPath: $.Demands.*.tenantId + - jsonPath: $.Demands.*.tenantId - - jsonPath: $.Demands.*.consumerCode + - jsonPath: $.Demands.*.consumerCode - - jsonPath: $.Demands.*.demandDetails - type: JSON - dbType: JSONB + - jsonPath: $.Demands.*.demandDetails + type: JSON + dbType: JSONB - - jsonPath: $.Demands.*.taxPeriodFrom + - jsonPath: $.Demands.*.taxPeriodFrom - - jsonPath: $.Demands.*.taxPeriodTo + - jsonPath: $.Demands.*.taxPeriodTo - - jsonPath: $.Demands.*.status + - jsonPath: $.Demands.*.status - - jsonPath: $.Demands.*.auditDetails.createdBy + - jsonPath: $.Demands.*.auditDetails.createdBy - - jsonPath: $.Demands.*.auditDetails.createdTime + - jsonPath: $.Demands.*.auditDetails.createdTime \ No newline at end of file diff --git a/egov-persister/case-persister.yml b/egov-persister/case-persister.yml index e7f5d89f..5f0e0ee8 100644 --- a/egov-persister/case-persister.yml +++ b/egov-persister/case-persister.yml @@ -813,11 +813,10 @@ serviceMaps: transactionCodeJsonPath: $.filingNumber auditAttributeBasePath: caseOverallStatus queryMaps: - - query: UPDATE dristi_cases SET stage =?, stageBackup =?, lastmodifiedby = ?, lastmodifiedtime = ? where filingnumber =? and tenantid =?; + - query: UPDATE dristi_cases SET stage =?, lastmodifiedby = ?, lastmodifiedtime = ? where filingnumber =? and tenantid =?; basePath: caseOverallStatus jsonMaps: - jsonPath: $.caseOverallStatus.stage - - jsonPath: $.caseOverallStatus.stageBackup - jsonPath: $.caseOverallStatus.auditDetails.lastModifiedBy - jsonPath: $.caseOverallStatus.auditDetails.lastModifiedTime - jsonPath: $.caseOverallStatus.filingNumber @@ -996,11 +995,11 @@ serviceMaps: transactionCodeJsonPath: $.filingNumber auditAttributeBasePath: $ queryMaps: - - query: UPDATE dristi_cases SET lprNumber = ?, isLPRCase = ?, courtCaseNumber = ?, courtCaseNumberBackup = ? WHERE filingNumber = ?; + - query: UPDATE dristi_cases SET lprNumber = ?, lifecycleStatus = ?, courtCaseNumber = ?, courtCaseNumberBackup = ? WHERE filingNumber = ?; basePath: cases jsonMaps: - jsonPath: $.cases.lprNumber - - jsonPath: $.cases.isLPRCase + - jsonPath: $.cases.lifecycleStatus - jsonPath: $.cases.courtCaseNumber - jsonPath: $.cases.courtCaseNumberBackup - jsonPath: $.cases.filingNumber diff --git a/pdf-service/data-config/application-production-of-documents.json b/pdf-service/data-config/application-production-of-documents.json index a00ae502..609e36e7 100644 --- a/pdf-service/data-config/application-production-of-documents.json +++ b/pdf-service/data-config/application-production-of-documents.json @@ -59,7 +59,7 @@ "value": { "path": "$.documentList.*" }, - "type": "index", + "type": "function", "format": "var i = 0; for (i=0;i< type.length;i++) {type[i]['index'] = i + 1;} return type;" }, { diff --git a/pdf-service/data-config/application-profile-edit-qr.json b/pdf-service/data-config/application-profile-edit-qr.json index 83be2897..e386bfa2 100644 --- a/pdf-service/data-config/application-profile-edit-qr.json +++ b/pdf-service/data-config/application-profile-edit-qr.json @@ -186,6 +186,30 @@ "path": "$.newResedentialAddress" } }, + { + "variable": "currentAddressCompanyDetails", + "value": { + "path": "$.currentAddressCompanyDetails" + } + }, + { + "variable": "newAddressCompanyDetails", + "value": { + "path": "$.newAddressCompanyDetails" + } + }, + { + "variable": "newCompanyName", + "value": { + "path": "$.newCompanyName" + } + }, + { + "variable": "newEntityType", + "value": { + "path": "$.newEntityType" + } + }, { "variable": "reasonForEditing", "value": { diff --git a/pdf-service/data-config/application-profile-edit.json b/pdf-service/data-config/application-profile-edit.json index 478ee97c..cee91ba7 100644 --- a/pdf-service/data-config/application-profile-edit.json +++ b/pdf-service/data-config/application-profile-edit.json @@ -186,6 +186,30 @@ "path": "$.newResedentialAddress" } }, + { + "variable": "currentAddressCompanyDetails", + "value": { + "path": "$.currentAddressCompanyDetails" + } + }, + { + "variable": "newAddressCompanyDetails", + "value": { + "path": "$.newAddressCompanyDetails" + } + }, + { + "variable": "newCompanyName", + "value": { + "path": "$.newCompanyName" + } + }, + { + "variable": "newEntityType", + "value": { + "path": "$.newEntityType" + } + }, { "variable": "reasonForEditing", "value": { diff --git a/pdf-service/data-config/etreasury-receipt.json b/pdf-service/data-config/etreasury-receipt.json index 14287c1d..0d34b5d9 100644 --- a/pdf-service/data-config/etreasury-receipt.json +++ b/pdf-service/data-config/etreasury-receipt.json @@ -99,4 +99,3 @@ ] } } - diff --git a/pdf-service/data-config/summons-accused-qr.json b/pdf-service/data-config/summons-accused-qr.json index 50f46b9c..ec46e969 100644 --- a/pdf-service/data-config/summons-accused-qr.json +++ b/pdf-service/data-config/summons-accused-qr.json @@ -153,4 +153,3 @@ ] } } - diff --git a/pdf-service/data-config/summons-accused.json b/pdf-service/data-config/summons-accused.json index a657175b..a75748ad 100644 --- a/pdf-service/data-config/summons-accused.json +++ b/pdf-service/data-config/summons-accused.json @@ -204,4 +204,3 @@ ] } } - diff --git a/pdf-service/data-config/summons-witness.json b/pdf-service/data-config/summons-witness.json index 907ed5d6..d5e5df2a 100644 --- a/pdf-service/data-config/summons-witness.json +++ b/pdf-service/data-config/summons-witness.json @@ -145,4 +145,3 @@ ] } } - diff --git a/pdf-service/format-config/application-profile-edit-qr.json b/pdf-service/format-config/application-profile-edit-qr.json index 8c62e3bc..58c939fd 100644 --- a/pdf-service/format-config/application-profile-edit-qr.json +++ b/pdf-service/format-config/application-profile-edit-qr.json @@ -197,6 +197,12 @@ "text": " Entity Type: {{currentEntityType}}", "style": "bodyText" }, + "{{#currentAddressCompanyDetails}}", + { + "text": "{{address}}", + "style": "bodyText" + }, + "{{/currentAddressCompanyDetails}}", "{{/isEntity}}", { "text": "New Details: ", @@ -234,6 +240,22 @@ "style": "bodyText" }, "{{/newResedentialAddress}}", + "{{#isEntity}}", + { + "text": " Company Name: {{newCompanyName}}", + "style": "bodyText" + }, + { + "text": " Entity Type: {{newEntityType}}", + "style": "bodyText" + }, + "{{#newAddressCompanyDetails}}", + { + "text": "{{address}}", + "style": "bodyText" + }, + "{{/newAddressCompanyDetails}}", + "{{/isEntity}}", { "text": "The petitioner assures and undertakes to the Honorable Court that this request is made in good faith and will not prejudice the other party.", "style": "bodyText" diff --git a/pdf-service/format-config/application-profile-edit.json b/pdf-service/format-config/application-profile-edit.json index 1c723abe..1fba99b0 100644 --- a/pdf-service/format-config/application-profile-edit.json +++ b/pdf-service/format-config/application-profile-edit.json @@ -172,17 +172,21 @@ "text": "Email ID: {{currentEmailId}}", "style": "bodyText" }, + "{{#currentPermanentAddress}}", { "text": "Addresses:", "style": "bodyText" }, - "{{#currentPermanentAddress}}", { "text": "{{address}}", "style": "bodyText" }, "{{/currentPermanentAddress}}", "{{#currentResedentialAddress}}", + { + "text": "Addresses:", + "style": "bodyText" + }, { "text": "{{address}}", "style": "bodyText" @@ -197,6 +201,16 @@ "text": " Entity Type: {{currentEntityType}}", "style": "bodyText" }, + "{{#currentAddressCompanyDetails}}", + { + "text": "Addresses:", + "style": "bodyText" + }, + { + "text": "{{address}}", + "style": "bodyText" + }, + "{{/currentAddressCompanyDetails}}", "{{/isEntity}}", { "text": "New Details: ", @@ -218,22 +232,46 @@ "text": "Email ID: {{newEmailId}}", "style": "bodyText" }, + "{{#newPermanentAddress}}", { "text": "Addresses:", "style": "bodyText" }, - "{{#newPermanentAddress}}", { "text": "{{address}}", "style": "bodyText" }, "{{/newPermanentAddress}}", "{{#newResedentialAddress}}", + { + "text": "Addresses:", + "style": "bodyText" + }, { "text": "{{address}}", "style": "bodyText" }, "{{/newResedentialAddress}}", + "{{#isEntity}}", + { + "text": " Company Name: {{newCompanyName}}", + "style": "bodyText" + }, + { + "text": " Entity Type: {{newEntityType}}", + "style": "bodyText" + }, + "{{#newAddressCompanyDetails}}", + { + "text": "Addresses:", + "style": "bodyText" + }, + { + "text": "{{address}}", + "style": "bodyText" + }, + "{{/newAddressCompanyDetails}}", + "{{/isEntity}}", { "text": "The petitioner assures and undertakes to the Honorable Court that this request is made in good faith and will not prejudice the other party.", "style": "bodyText" diff --git a/pdf-service/format-config/bnss-notice-epost.json b/pdf-service/format-config/bnss-notice-epost.json index 2cd44603..9834cd7d 100644 --- a/pdf-service/format-config/bnss-notice-epost.json +++ b/pdf-service/format-config/bnss-notice-epost.json @@ -75,6 +75,11 @@ ], "margin": [0, 10] }, + { + "text": "Next Hearing Date: {{hearingDate}}", + "style": "next-hearing-date", + "layout": "noBorders" + }, { "table": { "widths": ["*"], @@ -410,6 +415,13 @@ } ], "styles": { + "next-hearing-date": { + "fontSize": 12, + "bold": true, + "color": "#000000", + "alignment": "right", + "margin": [0, 0, 0, 10] + }, "form-header": { "color": "#252525", "fontFamily": "Roboto", diff --git a/pdf-service/format-config/bnss-notice.json b/pdf-service/format-config/bnss-notice.json index e7f3b2ea..df93a26c 100644 --- a/pdf-service/format-config/bnss-notice.json +++ b/pdf-service/format-config/bnss-notice.json @@ -75,6 +75,11 @@ ], "margin": [0, 10] }, + { + "text": "Next Hearing Date: {{hearingDate}}", + "style": "next-hearing-date", + "layout": "noBorders" + }, { "table": { "widths": ["*"], @@ -384,6 +389,13 @@ } ], "styles": { + "next-hearing-date": { + "fontSize": 12, + "bold": true, + "color": "#000000", + "alignment": "right", + "margin": [0, 0, 0, 10] + }, "form-header": { "color": "#252525", "fontFamily": "Roboto", diff --git a/pdf-service/format-config/dca-notice-epost.json b/pdf-service/format-config/dca-notice-epost.json index d8655702..fa5d4dd2 100644 --- a/pdf-service/format-config/dca-notice-epost.json +++ b/pdf-service/format-config/dca-notice-epost.json @@ -75,6 +75,11 @@ ], "margin": [0, 10] }, + { + "text": "Next Hearing Date: {{hearingDate}}", + "style": "next-hearing-date", + "layout": "noBorders" + }, { "table": { "widths": ["*"], @@ -411,6 +416,13 @@ } ], "styles": { + "next-hearing-date": { + "fontSize": 12, + "bold": true, + "color": "#000000", + "alignment": "right", + "margin": [0, 0, 0, 10] + }, "form-header": { "color": "#252525", "fontFamily": "Roboto", diff --git a/pdf-service/format-config/dca-notice.json b/pdf-service/format-config/dca-notice.json index beeac16a..3884ac5b 100644 --- a/pdf-service/format-config/dca-notice.json +++ b/pdf-service/format-config/dca-notice.json @@ -75,6 +75,11 @@ ], "margin": [0, 10] }, + { + "text": "Next Hearing Date: {{hearingDate}}", + "style": "next-hearing-date", + "layout": "noBorders" + }, { "table": { "widths": ["*"], @@ -385,6 +390,13 @@ } ], "styles": { + "next-hearing-date": { + "fontSize": 12, + "bold": true, + "color": "#000000", + "alignment": "right", + "margin": [0, 0, 0, 10] + }, "form-header": { "color": "#252525", "fontFamily": "Roboto", diff --git a/pdf-service/format-config/summons-accused.json b/pdf-service/format-config/summons-accused.json index 4584abcc..f057acac 100644 --- a/pdf-service/format-config/summons-accused.json +++ b/pdf-service/format-config/summons-accused.json @@ -57,6 +57,11 @@ }, "layout": "noBorders" }, + { + "text": "Next Hearing Date: {{hearingDate}}", + "style": "next-hearing-date", + "layout": "noBorders" + }, { "style": "form-body", "table": { @@ -437,6 +442,13 @@ } ], "styles": { + "next-hearing-date": { + "fontSize": 12, + "bold": true, + "color": "#000000", + "alignment": "right", + "margin": [0, 0, 0, 10] + }, "form-header": { "color": "#484848", "fontFamily": "Roboto", @@ -525,4 +537,4 @@ } } } -} \ No newline at end of file +} diff --git a/pdf-service/format-config/summons-witness.json b/pdf-service/format-config/summons-witness.json index ab6cda81..3f2ccb6d 100644 --- a/pdf-service/format-config/summons-witness.json +++ b/pdf-service/format-config/summons-witness.json @@ -53,6 +53,11 @@ }, "layout": "noBorders" }, + { + "text": "Next Hearing Date: {{hearingDate}}", + "style": "next-hearing-date", + "layout": "noBorders" + }, { "style": "form-body", "table": { @@ -111,6 +116,13 @@ } ], "styles": { + "next-hearing-date": { + "fontSize": 12, + "bold": true, + "color": "#000000", + "alignment": "right", + "margin": [0, 0, 0, 10] + }, "form-header": { "color": "#484848", "fontFamily": "Roboto", diff --git a/pdf-service/format-config/warrant-generic.json b/pdf-service/format-config/warrant-generic.json index e48b80bf..a4bb703b 100644 --- a/pdf-service/format-config/warrant-generic.json +++ b/pdf-service/format-config/warrant-generic.json @@ -30,6 +30,11 @@ }, "layout": "noBorders" }, + { + "text": "Next Hearing Date: {{hearingDate}}", + "style": "next-hearing-date", + "layout": "noBorders" + }, { "style": "form-body", "table": { @@ -123,6 +128,13 @@ "color": "#484848", "alignment": "right" }, + "next-hearing-date": { + "fontSize": 12, + "bold": true, + "color": "#000000", + "alignment": "right", + "margin": [0, 0, 0, 10] + }, "footer-content": { "color": "#484848", "fontSize": 11, diff --git a/pdf-service/format-config/warrants-bailable.json b/pdf-service/format-config/warrants-bailable.json index a9b536a4..144a24a8 100644 --- a/pdf-service/format-config/warrants-bailable.json +++ b/pdf-service/format-config/warrants-bailable.json @@ -53,6 +53,11 @@ }, "layout": "noBorders" }, + { + "text": "Next Hearing Date: {{hearingDate}}", + "style": "next-hearing-date", + "layout": "noBorders" + }, { "style": "form-body", "table": { @@ -215,6 +220,13 @@ } ], "styles": { + "next-hearing-date": { + "fontSize": 12, + "bold": true, + "color": "#000000", + "alignment": "right", + "margin": [0, 0, 0, 10] + }, "tl-head": { "fillColor": "white", "margin": [ diff --git a/pdf-service/format-config/warrants-non-bailable.json b/pdf-service/format-config/warrants-non-bailable.json index 1bb4fea2..2bc1a112 100644 --- a/pdf-service/format-config/warrants-non-bailable.json +++ b/pdf-service/format-config/warrants-non-bailable.json @@ -54,6 +54,11 @@ }, "layout": "noBorders" }, + { + "text": "Next Hearing Date: {{hearingDate}}", + "style": "next-hearing-date", + "layout": "noBorders" + }, { "style": "form-body", "table": { @@ -177,6 +182,18 @@ "color": "#484848", "alignment": "right" }, + "next-hearing-date": { + "fontSize": 12, + "bold": true, + "color": "#000000", + "alignment": "right", + "margin": [ + 0, + 0, + 0, + 10 + ] + }, "footer-content": { "color": "#484848", "fontSize": 11, diff --git a/pdf-service/format-config/witness-warrant-pdf.json b/pdf-service/format-config/witness-warrant-pdf.json index 550fb8f3..ec5021a9 100644 --- a/pdf-service/format-config/witness-warrant-pdf.json +++ b/pdf-service/format-config/witness-warrant-pdf.json @@ -53,6 +53,11 @@ }, "layout": "noBorders" }, + { + "text": "Next Hearing Date: {{hearingDate}}", + "style": "next-hearing-date", + "layout": "noBorders" + }, { "style": "form-body", "table": { @@ -129,6 +134,13 @@ } ], "styles": { + "next-hearing-date": { + "fontSize": 12, + "bold": true, + "color": "#000000", + "alignment": "right", + "margin": [0, 0, 0, 10] + }, "tl-head": { "fillColor": "white", "margin": [ diff --git a/python-scripts/compare_localization_btw_env.py b/python-scripts/compare_localization_btw_env.py index f2446e39..cc3c16d1 100644 --- a/python-scripts/compare_localization_btw_env.py +++ b/python-scripts/compare_localization_btw_env.py @@ -7,6 +7,7 @@ ENV_URLS = { "dev": "https://dristi-kerala-dev.pucar.org", "qa": "https://dristi-kerala-qa.pucar.org", + "uat": "https://oncourts-staging.kerala.gov.in", "demo": "https://demo.pucar.org", "prod": "https://oncourts.kerala.gov.in", } diff --git a/python-scripts/update_missing_localizations.py b/python-scripts/update_missing_localizations.py index d96563d0..bde032ac 100644 --- a/python-scripts/update_missing_localizations.py +++ b/python-scripts/update_missing_localizations.py @@ -1,7 +1,7 @@ import csv import requests import logging -import time +import argparse # Logger setup for better debugging logging.basicConfig( @@ -10,26 +10,36 @@ # env list we need to update the localization env_list = [ - # { - # "url": "dristi-kerala-dev.pucar.org", - # "password": "Beehyv@123", - # "username": "mdmsv2Super", - # }, { + "env": "dev", + "url": "dristi-kerala-dev.pucar.org", + "password": "Beehyv@123", + "username": "mdmsv2Super", + }, + { + "env": "qa", "url": "dristi-kerala-qa.pucar.org", "password": "Beehyv@123", "username": "mdmsv2Qa", }, - # { - # "url": "demo.pucar.org", - # "password": "Beehyv@123", - # "username": "mdmsv2Demo", - # }, - # { - # "url": "oncourts.kerala.gov.in", - # "password": "oN24*7@56", - # "username": "On247loc", - # }, + { + "env": "demo", + "url": "demo.pucar.org", + "password": "Beehyv@123", + "username": "mdmsv2Demo", + }, + { + "env": "uat", + "url": "oncourts-staging.kerala.gov.in", + "password": "Beehyv@123", + "username": "workbenchuser", + }, + { + "env": "prod", + "url": "oncourts.kerala.gov.in", + "password": "oN24*7@56", + "username": "On247loc", + }, ] # File data to be processed (can easily add more files as needed) @@ -138,9 +148,17 @@ def process_file(file_module, env): # Main function to process all files across all environments -def process_localizations(): - for env in env_list: - logging.info(f"--- Processing environment: {env['url']} ---") +def process_localizations(selected_envs=None): + targets = env_list + if selected_envs: + targets = [e for e in env_list if e["env"] in selected_envs] + if not targets: + logging.error(f"No matching environments found for: {selected_envs}") + logging.info(f"Available envs: {[e['env'] for e in env_list]}") + return + + for env in targets: + logging.info(f"--- Processing environment: {env['env']} ({env['url']}) ---") token = get_auth_token(env) if not token: logging.error(f"Skipping environment {env['url']} due to auth failure") @@ -155,4 +173,14 @@ def process_localizations(): if __name__ == "__main__": - process_localizations() + parser = argparse.ArgumentParser(description="Update missing localizations across environments") + parser.add_argument( + "--envs", + type=lambda s: [e.strip() for e in s.split(",")], + metavar="ENV", + help="Comma-separated list of environments to update (e.g. dev,qa,uat). " + f"Available: {[e['env'] for e in env_list]}", + required=True, + ) + args = parser.parse_args() + process_localizations(selected_envs=args.envs)